Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/CustomAnalysisItemSettingService.java

@@ -86,6 +86,8 @@ public class CustomAnalysisItemSettingService extends ServiceImpl<CustomAnalysis
             temp = this.add(customAnalysisItemSetting, uid);
         }
         customAnalysisItemSetting.setId(temp.getId());
+        BeanUtils.copyProperties(customAnalysisItemSetting,temp);
+        customAnalysisItemSetting.setUid(uid);
         customAnalysisItemSetting.setColorConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getColor()));
         customAnalysisItemSetting.setTableConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getTable()));
         customAnalysisItemSetting.setLineConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getLine()));

src/main/java/cn/cslg/pas/service/business/MergePersonService.java

@@ -659,6 +659,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         List<MergePerson> mergePeopleList = mergePersonMapper.selectList(new LambdaQueryWrapper<MergePerson>()
                 .eq(MergePerson::getProjectId, projectId));
         int size = mergePeopleList.size();
+        int mergedCount = 0;
         if (!CollectionUtils.isEmpty(mergePeopleList)) {
             for (MergePerson person : mergePeopleList) {
                 GetAllPersonDTO dto = new GetAllPersonDTO();
@@ -675,6 +676,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                 mergedList.addAll(getNames);
                 mergePersonList.add(dto);
             }
+            mergedCount = mergedList.size() + 1;
         }
 
         SearchRequest.Builder builder = new SearchRequest.Builder();
@@ -860,13 +862,13 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
             personDTOList.addAll(list);
         }
 
-//        if (personDTOList.size() > pageSize) {
-//            personDTOList.remove(personDTOList.size() - 1);
-//        }
         while (personDTOList.size() > pageSize) {
             personDTOList.remove(personDTOList.size() - 1); // 从列表末尾开始删除
         }
 
+        if (size > 0 || mergedCount > 0) {
+            total = total + Long.parseLong(String.valueOf(size)) - Long.parseLong(String.valueOf(mergedCount));
+        }
         Records records = new Records();
         records.setCurrent(pageNum);
         records.setSize(pageSize);