通讯录消息相关接口

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -79,10 +79,13 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
             dto.setStaffId(item.getStaffId());
             dto.setReadFlag(item.getReadFlag());
             CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId());
-            dto.setStaffName(staffInfoCache.getRealName());
-            dto.setGender(staffInfoCache.getGender());
-            dto.setHeadPhoto(staffInfoCache.getHeadPhoto());
-            dto.setOrgName(staffInfoCache.getTwoOrgName());
+            if (null != staffInfoCache) {
+                dto.setStaffName(staffInfoCache.getRealName());
+                dto.setGender(staffInfoCache.getGender());
+                dto.setHeadPhoto(staffInfoCache.getHeadPhoto());
+                dto.setOrgName(staffInfoCache.getTwoOrgName());
+            }
+
             return dto;
         }).collect(Collectors.toList());
         result.setDataList(dataList);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -483,9 +483,12 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         }
         return staffRoleList.stream().map(item -> {
             RoleUsersResultDTO dto = new RoleUsersResultDTO();
-            dto.setStaffId(item.getStaffId());
             //从redis获取用户信息
             CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId());
+            if (null == staffInfoCache) {
+                return null;
+            }
+            dto.setStaffId(item.getStaffId());
             dto.setGender(staffInfoCache.getGender());
             dto.setHeadPhoto(staffInfoCache.getHeadPhoto());
             dto.setName(staffInfoCache.getRealName());

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml

@@ -100,7 +100,7 @@
                 customer_agency ca
         LEFT JOIN (
         SELECT
-                a.PIDS,
+                CONCAT( a.PIDS,':',a.ID) AS PIDS,
                 b.USER_ID
         FROM
                 customer_agency a

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -426,7 +426,7 @@ public class StaffServiceImpl implements StaffService {
 		String key = RedisKeys.getCpUserKey("gov", "wxmp", fromDTO.getStaffId());
 		redisUtils.delete(key);
 		//10 清除工作人员缓存
-		customerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(), fromDTO.getStaffId());
+		CustomerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(), fromDTO.getStaffId());
 	}
 
 	/**