|
@ -58,9 +58,9 @@ import com.epmet.modules.utils.ModuleConstant; |
|
|
import com.epmet.resi.group.constant.*; |
|
|
import com.epmet.resi.group.constant.*; |
|
|
import com.epmet.resi.group.dto.UserRoleDTO; |
|
|
import com.epmet.resi.group.dto.UserRoleDTO; |
|
|
import com.epmet.resi.group.dto.group.*; |
|
|
import com.epmet.resi.group.dto.group.*; |
|
|
import com.epmet.resi.group.dto.group.form.*; |
|
|
|
|
|
import com.epmet.resi.group.dto.group.form.GridIdFormDTO; |
|
|
import com.epmet.resi.group.dto.group.form.GridIdFormDTO; |
|
|
import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO; |
|
|
import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO; |
|
|
|
|
|
import com.epmet.resi.group.dto.group.form.*; |
|
|
import com.epmet.resi.group.dto.group.result.*; |
|
|
import com.epmet.resi.group.dto.group.result.*; |
|
|
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; |
|
|
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; |
|
|
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; |
|
|
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; |
|
@ -291,6 +291,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
} |
|
|
} |
|
|
//获取组长信息
|
|
|
//获取组长信息
|
|
|
Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); |
|
|
Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); |
|
|
|
|
|
|
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
} else { |
|
|
} else { |
|
@ -771,7 +772,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
} else { |
|
|
} else { |
|
|
logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); |
|
|
logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return new Result<GovGroupSummarizeResultDTO>().ok(resultDTO); |
|
|
return new Result<GovGroupSummarizeResultDTO>().ok(resultDTO); |
|
@ -960,7 +961,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { |
|
|
dto.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
dto.setLeaderName(groupLeaderUserInfo.getData().getShowName()); |
|
|
} else { |
|
|
} else { |
|
|
logger.warn("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); |
|
|
logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId()); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
return recommendGroupList; |
|
|
return recommendGroupList; |
|
|