showName修改

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

@@ -354,10 +354,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (null == groupMemberDTO) {
 			return new Result<>();
 		}
+		// 查询小组信息，为了拿小组的类型，是支部还是楼院
+		ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId);
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
 		resiUserInfoFormDTO.setCustomerId(customerId);
 		resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
-		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		Result<UserResiInfoResultDTO> userResiInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		if (!userResiInfo.success()){
+			throw new RenException("根据组id查询组长信息失败了");
+		}
+		if (null != resiGroup  && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){
+			UserResiInfoResultDTO data = userResiInfo.getData();
+			userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName());
+		}
+		return userResiInfo;
 	}
 
 	/**