网格缓存信息添加 废弃字段

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

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