组信息编辑-申请详情接口按组类型返回真实人名

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

@@ -62,6 +62,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.*;
 import com.epmet.resi.group.dto.UserRoleDTO;
@@ -164,6 +165,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
+	@Autowired
+	private ResiTopicService resiTopicService;
 
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@@ -993,7 +996,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public List<String> getGroupIdByGridId(String gridId) {
-		if(StringUtils.isBlank(gridId)) return null;
+		if(StringUtils.isBlank(gridId)) {
+			return null;
+		}
 		return baseDao.getGroupIdByGridId(gridId);
 	}
 
@@ -1483,7 +1488,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
         _update.setId(edit.getId());_update.setReadFlag(ModuleConstant.READ);
         groupEditSubmitRecordDao.updateById(_update);
         GroupEditionDetailResultDTO result = ConvertUtils.sourceToTarget(edit, GroupEditionDetailResultDTO.class);
-        result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+        ResiGroupEntity entity = resiGroupDao.selectById(param.getGroupId());
+        if("branch".equals(entity.getGroupType())){
+			List<String> userIds = new ArrayList<>();
+			userIds.add(edit.getCreatedBy());
+			List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds);
+			userInfos.forEach(u->{
+				if(edit.getCreatedBy().equals(u.getUserId())){
+					result.setGroupLeaderName(u.getReleaseUserName());
+				}
+			});
+		} else {
+			result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+		}
         return result;
 	}