小组管理界面接口按组类型返回真实人名

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

@@ -37,6 +37,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -855,13 +856,25 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
 		resultDTO.setTotalTopics(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalTopics());
 
-		//获取组长信息
+		//根据组类型判断是否返真实姓名
+		ResiGroupEntity entity = resiGroupDao.selectById(resiGroupInfoRedisDTO.getGroupId());
 		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(formDTO.getGroupId());
+		if("branch".equals(entity.getGroupType())){
+			//获取组长信息
+			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+				String street = groupLeaderUserInfo.getData().getStreet() == null ? "" : groupLeaderUserInfo.getData().getStreet() + "-";
+				resultDTO.setLeaderName(street + groupLeaderUserInfo.getData().getSurname() + groupLeaderUserInfo.getData().getName());
+			} else {
+				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
+			}
+		} else {
+			//获取组长信息
 			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 				resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 			} else {
 				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
 			}
+		}
 
 		return new Result<GovGroupSummarizeResultDTO>().ok(resultDTO);
 	}
@@ -993,8 +1006,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public Map<String, Set<String>> getGroupIdsByGridIdList(List<String> gridIdList) {
-		if(null == gridIdList || gridIdList.size() < NumConstant.ONE)
+		if(null == gridIdList || gridIdList.size() < NumConstant.ONE){
 			return null;
+		}
 		Map<String, Set<String>> result = new HashMap<>();
 		List<ResiGroupDTO> groups = new ArrayList<>();
 		Map<String,List<ResiGroupDTO>> groupMap

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

@@ -479,8 +479,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 url.append(user.getHeadImgUrl());
             }
         });
-        resultDTO.setReleaseUserName(name.toString());
-        resultDTO.setReleaseUserHeadPhoto(url.toString());
+        resultDTO.setReleaseUserName(String.valueOf(name));
+        resultDTO.setReleaseUserHeadPhoto(String.valueOf(url));
         fileList.forEach(f -> {
             if ("image".equals(f.getType())) {
                 imageList.add(f);