遗漏代码

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -287,16 +287,19 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                     communityManageHandle(result, dto, entity);
 
                 } else if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
-                    GridAddFormDTO gridAddFormDTO = new GridAddFormDTO();
-                    gridAddFormDTO.setGridNum(entity.getName());
-                    gridAddFormDTO.setCircleId(entity.getPid().intValue());
-                    gridAddFormDTO.setCreateTime(entity.getCreateDate().toString());
-                    gridAddFormDTO.setParentId(NumConstant.ZERO);
-                    gridAddFormDTO.setLevel(NumConstant.ONE);
-                    gridAddFormDTO.setGridDesc(dto.getIntroduction());
-                    gridAddFormDTO.setOldGridId(entity.getId().toString());
-                    Result<GlobalResultDTO> result = communityManageFeignClient.addGrid(gridAddFormDTO);
-                    communityManageHandle(result, dto, entity);
+                    SysDeptInfoDTO sysDeptInfoDTO = sysDeptInfoService.getDeptInfoByDeptID(entity.getPid().toString());
+                    if (sysDeptInfoDTO != null && sysDeptInfoDTO.getManageId() != null) {
+                        GridAddFormDTO gridAddFormDTO = new GridAddFormDTO();
+                        gridAddFormDTO.setGridNum(entity.getName());
+                        gridAddFormDTO.setCircleId(sysDeptInfoDTO.getManageId());
+                        gridAddFormDTO.setCreateTime(entity.getCreateDate().toString());
+                        gridAddFormDTO.setParentId(NumConstant.ZERO);
+                        gridAddFormDTO.setLevel(NumConstant.ONE);
+                        gridAddFormDTO.setGridDesc(dto.getIntroduction());
+                        gridAddFormDTO.setOldGridId(entity.getId().toString());
+                        Result<GlobalResultDTO> result = communityManageFeignClient.addGrid(gridAddFormDTO);
+                        communityManageHandle(result, dto, entity);
+                    }
                 }
             } else if (type == NumConstant.ONE) {
                 SysDeptInfoDTO sysDeptInfoDTO = sysDeptInfoService.getDeptInfoByDeptID(dto.getId().toString());