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 1c6cc3f142..bf50316c61 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 @@ -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 page(Map params) { @@ -993,7 +996,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 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 userIds = new ArrayList<>(); + userIds.add(edit.getCreatedBy()); + List 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; }