可胜任组长-组员列表(工作端通用)接口按组类型返人名

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java

@@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable {
     private String userId;
     private String userShowName;
     private String headPhoto;
+    private String realName;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java

@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
 import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import com.epmet.dataaggre.redis.ResiGroupRedis;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
@@ -63,12 +65,18 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
         // 查询用户信息【名字 头像】
         List<UserInfosResultDTO> userInfos = epmetUserService.selectUserInfosByUserIds(userIds);
+        //查询小组信息
+        ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
         result.forEach(r -> {
             if (!CollectionUtils.isEmpty(userInfos)){
                 userInfos.forEach(u -> {
                     if (r.getUserId().equals(u.getUserId())){
                         r.setHeadPhoto(u.getHeadPhoto());
-                        r.setUserShowName(u.getUserShowName());
+                        if("branch".equals(group.getGroupType())){
+                            r.setUserShowName(u.getRealName());
+                        }else {
+                            r.setUserShowName(u.getUserShowName());
+                        }
                     }
                 });
             }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -12,7 +12,8 @@
                        WHEN GENDER = '2' THEN '女士'
                        ELSE '先生/女士' END
                 ) AS userShowName,
-            HEAD_IMG_URL AS headPhoto
+            HEAD_IMG_URL AS headPhoto,
+            REAL_NAME AS realName
         FROM user_base_info
         WHERE DEL_FLAG = 0
           AND