Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -539,8 +539,24 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         if (null != pastTopics && pastTopics.size() > 0) {
 
         //2. 在缓存中拉取用户信息
-        setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics);
-
+//        setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics);
+            ResiGroupEntity resiGroup = resiGroupDao.selectById(topicPageFormDTO.getGroupId());
+            if(null == resiGroup){
+                throw new RenException("此小组信息不存在");
+            }
+            List<String> userIds = pastTopics.stream().map(m -> m.getUserId()).collect(Collectors.toList());
+            List<UserInfoResultDTO> userInfos = disPoseUserInfo(resiGroup.getGroupType(), userIds);
+            if (CollectionUtils.isEmpty(userInfos)){
+                throw new RenException("未查询到用户信息");
+            }
+            pastTopics.forEach(t -> {
+                userInfos.forEach(u -> {
+                    if (t.getUserId().equals(u.getUserId())){
+                        t.setReleaseUserName(u.getReleaseUserName());
+                        t.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto());
+                    }
+                });
+            });
             //3.用户徽章
             //3.1首先需要拿到客户Id
             List<String> other = pastTopics.stream()

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -51,7 +51,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
     private List<String> userRoleList;
 
     /**
-     *
+     * XX街道-Y先生/女士   如果是未认证居民，这一列为空
      */
     private String userStreetName;
+    /**
+     * XX街道-YYY  如果是未认证居民，这一列为空
+     */
+    private String userStreetTrueName;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -273,6 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         visitedFormDTO.setUserId(enterGridFormDTO.getUserId());
         visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
         resultObj.setUserStreetName(StrConstant.EPMETY_STR);
+        resultObj.setUserStreetTrueName(StrConstant.EPMETY_STR);
         if (strangerInfo != null){
             if (StringUtils.isNotBlank(strangerInfo.getStreet()) && StringUtils.isNotBlank(strangerInfo.getSurname())){
                 String gender = null;
@@ -284,7 +285,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                     gender = UserConstant.MAN_WOMAN;
                 }
                 String leaderName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(gender);
+                String userStreetTrueName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(strangerInfo.getName());
                 resultObj.setUserStreetName(leaderName);
+                resultObj.setUserStreetTrueName(userStreetTrueName);
                 visitedFormDTO.setIsReg(NumConstant.ONE_STR);
             }
         }