From bdd006f0d26f9a9d09134516f01ffdf975189ba7 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 20 Aug 2021 17:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/common/CustomerStaffRedis.java | 4 +++-
 .../service/epmetuser/impl/EpmetUserServiceImpl.java         | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
index 72dd12d1ab..97e545f98f 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
@@ -70,7 +70,9 @@ public class CustomerStaffRedis {
         }
 
         CustomerStaffInfoCache resultData = reloadStaffCache(staffId, key);
-        if (resultData == null) return null;
+        if (resultData == null) {
+            return null;
+        }
 
         return ConvertUtils.sourceToTarget(resultData,CustomerStaffInfoCacheResult.class);
     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index bc78ba62a5..3cfb3acf89 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -537,7 +537,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         CustomerStaffEntity staffEntity = customerStaffDao.selectOne(queryWrapper);
         CustomerStaffResultDTO result = ConvertUtils.sourceToTarget(staffEntity, CustomerStaffResultDTO.class);
 
-        //2.查询工作人员所属组织信息
+        //查询工作人员所属组织信息
         CustomerAgencyDTO agencyDTO = govOrgService.gridByAgencyId(null,staffId);
         if (agencyDTO == null){
             log.error("getStaffInfo have any agency staffId:{}",staffId);
@@ -569,7 +569,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         Map<String, String> roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName));
         result.setRoleMap(roleMap);
 
-        //1.查询当前人员所在的网格列表
+        //1.查询工作人员所在的网格列表
         List<CustomerGridDTO> list = govOrgService.getStaffGridList(staffId);
         List<IdAndNameDTO> idAndNameList = new ArrayList<>();
         for (CustomerGridDTO customerGridDTO : list) {
@@ -583,6 +583,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         }
         result.setGridList(idAndNameList);
 
+        //查询工作人员所在的部门列表
         List<CustomerDepartmentDTO> deptList = govOrgService.getStaffDeptList(staffId);
         idAndNameList = new ArrayList<>();
         for (CustomerDepartmentDTO org : deptList) {