From 19563fee8a59d781f776c4b5c01598f000d0cdca Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 09:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BD=91=E6=A0=BC=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcWorkLogServiceImpl.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
index e5ea8300db..ca65ac3ba4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
@@ -21,6 +21,7 @@ import com.epmet.dto.IcWorkLogFileDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.CustomerGridEntity;
 import com.epmet.entity.IcWorkLogEntity;
 import com.epmet.entity.IcWorkLogFileEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
@@ -115,6 +116,11 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     public IcWorkLogDTO get(String id) {
         IcWorkLogEntity entity = baseDao.selectById(id);
         IcWorkLogDTO dto = ConvertUtils.sourceToTarget(entity, IcWorkLogDTO.class);
+        if (StringUtils.isNotBlank(entity.getGridId())) {
+            CustomerGridEntity grid = customerGridDao.selectById(entity.getGridId());
+            dto.setGridName(grid.getGridName());
+        }
+
         Map<String, Object> params = new HashMap<>(2);
         params.put("logId", id);
         List<IcWorkLogFileDTO> files = icWorkLogFileService.list(params);