fixed merged

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

@@ -657,7 +657,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         //es获取的名称
         List<GetAllPersonDTO> personList = new ArrayList<>();
 
-        //获取被 合并的名称
+        //获取被合并的名称
         List<String> mergedList = new ArrayList<>();
         List<MergePerson> mergePeopleList = mergePersonMapper.selectList(new LambdaQueryWrapper<MergePerson>()
                 .eq(MergePerson::getProjectId, projectId)
@@ -886,6 +886,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                     personList.removeIf(i -> i.getName().equals(s));
                 }
             }
+            if (!CollectionUtils.isEmpty(mergePeopleList)) {
+                List<String> mergePeopleList1 = mergePeopleList.stream().map(MergePerson::getName).distinct().collect(Collectors.toList());
+                for (String s : mergePeopleList1) {
+                    personList.removeIf(i -> i.getName().equals(s));
+                }
+            }
             List<GetAllPersonDTO> collect = personList.stream().filter(i -> !StringUtils.isEmpty(i.getName())).collect(Collectors.toList());
 
             while (collect.size() > pageSize) {