diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 8a5ee3bdc..e14f6b962 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -150,10 +150,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 
         SysDeptEntity entity = baseDao.getById(id);
         SysDeptDTO dto = ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
-
-        GisGridDTO gisGridDTO = gisGridService.getByGridName(dto.getName());
-        if (gisGridDTO != null) {
-            dto.setGisGridId(dto.getGisGridId());
+        if (dto != null) {
+            GisGridDTO gisGridDTO = gisGridService.getByGridName(dto.getName());
+            if (gisGridDTO != null) {
+                dto.setGisGridId(dto.getGisGridId());
+            }
         }
         return dto;
     }