修改补建群的ID和name

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java

@@ -55,10 +55,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 import static java.util.stream.Collectors.toList;
 
@@ -231,7 +228,11 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
 
         // 补建群
         reduce.forEach(gridId -> {
-            createGroup(dto.getId(), dto.getDeptId(), dto.getDeptName());
+            Optional<DeptLevelAndLeaderDTO> gridOptional = gridList.stream().filter(item -> item.getDeptId().equals(gridId)).findFirst();
+            if (gridOptional.isPresent()) {
+                DeptLevelAndLeaderDTO grid = gridOptional.get();
+                createGroup(dto.getId(), grid.getDeptId(), grid.getDeptName());
+            }
         });
     }