From 54a8d2ede14e86bcf6e8138fd128167061d0e082 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 17 Mar 2022 11:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BC=93=E5=AD=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=20=E5=BA=9F=E5=BC=83=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerGridServiceImpl.java   | 8 --------
 .../src/main/resources/mapper/CustomerGridDao.xml         | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index f57f99bcdf..3b9e0be490 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -822,14 +822,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         if (null != gridInfo) {
             redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         }
-        /*CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
-        if (null != gridInfo) {
-            CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
-            gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
-            gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
-
-            redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
-        }*/
         return gridInfo;
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 4690b1f384..426b4fbb0a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -766,7 +766,8 @@
             cg.mobile,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
             IFNULL(cg.longitude,ca.longitude) longitude,
-            IFNULL(cg.latitude,ca.latitude) latitude
+            IFNULL(cg.latitude,ca.latitude) latitude,
+            cg.ABANDON_FLAG
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id