fix: 审核通过时发送 names[]/urls[] 数组,列表正确显示多名称多地址
This commit is contained in:
@@ -52,8 +52,8 @@ public interface SiteService {
|
||||
/** 待审核变更列表 */
|
||||
List<SiteChangeDTO> listPendingChanges();
|
||||
|
||||
/** 审核通过 → 写入 sites 表(支持审核时编辑 name/baseUrl/siteType/status/notes) */
|
||||
Site approveChange(Long changeId, Long reviewerId, String name, String baseUrl,
|
||||
/** 审核通过 → 写入 sites 表(支持审核时编辑 names/urls/...) */
|
||||
Site approveChange(Long changeId, Long reviewerId, List<String> names, List<String> urls,
|
||||
String siteType, String status, String notes);
|
||||
|
||||
/** 拒绝变更 */
|
||||
|
||||
@@ -236,7 +236,7 @@ public class SiteServiceImpl implements SiteService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Site approveChange(Long changeId, Long reviewerId, String reviewerName, String reviewerBaseUrl,
|
||||
public Site approveChange(Long changeId, Long reviewerId, List<String> reviewerNames, List<String> reviewerUrls,
|
||||
String reviewerSiteType, String reviewerStatus, String reviewerNotes) {
|
||||
SiteChange entry = changeMapper.selectById(changeId);
|
||||
if (entry == null) throw new IllegalArgumentException("变更记录不存在");
|
||||
@@ -251,9 +251,9 @@ public class SiteServiceImpl implements SiteService {
|
||||
|
||||
// 优先使用审核者编辑的数据,否则用原始提交数据
|
||||
@SuppressWarnings("unchecked")
|
||||
List<String> names = reviewerName != null ? List.of(reviewerName)
|
||||
List<String> names = (reviewerNames != null && !reviewerNames.isEmpty()) ? reviewerNames
|
||||
: (List<String>) raw.getOrDefault("names", List.of());
|
||||
List<String> urls = reviewerBaseUrl != null ? List.of(reviewerBaseUrl)
|
||||
List<String> urls = (reviewerUrls != null && !reviewerUrls.isEmpty()) ? reviewerUrls
|
||||
: (List<String>) raw.getOrDefault("urls", List.of());
|
||||
String notes = reviewerNotes != null ? reviewerNotes : (String) raw.getOrDefault("notes", "");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user