From 2297a62d38df5adccd7874d3b3b29919ee9be11a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 10 Oct 2022 09:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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;
     }