修改getdept不过

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

@@ -1479,6 +1479,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public SysDeptDTO getDept(CityCenterFromDTO formDTO) {
         SysDeptEntity entity = baseDao.selectById(formDTO.getDeptId());
+        if (entity == null) {
+            return null;
+        }
         if ("grid_party".equals(entity.getTypeKey())) {
             return ConvertUtils.sourceToTarget(baseDao.selectById(entity.getPid()), SysDeptDTO.class);
         }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -3941,7 +3941,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDTO.setDeptId(deptId);
         Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
         if (dept.success()) {
-            return dept.getData().getDisCenterZoningCode();
+            return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode();
         }
         return "";
     }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -1236,7 +1236,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @Date 2022/9/23 16:58
      */
     private String getJgbm(Long deptId, String type) {
-        if (null == deptId) {
+        if (null == deptId || 0L == deptId) {
             return "";
         }
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
@@ -1244,9 +1244,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
         if (dept.success()) {
             if (NumConstant.ZERO_STR.equals(type)) {
-                return dept.getData().getDisCenterZoningCode();
+                return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode();
             } else {
-                return dept.getData().getName();
+                return dept.getData() == null ? "" : dept.getData().getName();
             }
         }
         return "";