From 867a2ae6f3e110c1a6fa6c76ac66a941dc91b023 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 13 Dec 2022 11:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=97=E6=BC=8F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/SysDeptServiceImpl.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 3296ee3..29f2b1e 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/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());