diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 7980a41f14..1c6cc3f142 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/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,12 +856,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl groupLeaderUserInfo = this.getGroupLeaderUserInfo(formDTO.getGroupId()); - if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { - resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + 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 { - logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId()); + //获取组长信息 + if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { + resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + } else { + logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId()); + } } return new Result().ok(resultDTO); @@ -993,8 +1006,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> getGroupIdsByGridIdList(List gridIdList) { - if(null == gridIdList || gridIdList.size() < NumConstant.ONE) - return null; + if(null == gridIdList || gridIdList.size() < NumConstant.ONE){ + return null; + } Map> result = new HashMap<>(); List groups = new ArrayList<>(); Map> groupMap diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 36a20ffde6..c0e8521ef2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/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 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);