diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java index 6460b3c..fa0f4dd 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java @@ -32,14 +32,6 @@ import com.elink.esua.epdc.constant.SysSmsTemplateConstant; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; -import com.elink.esua.epdc.smile.dto.constant.GroupConstant; -import com.elink.esua.epdc.smile.dto.constant.GroupNoticeConstant; -import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum; -import com.elink.esua.epdc.smile.dto.enums.GroupUserStateEnum; -import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO; -import com.elink.esua.epdc.smile.dto.group.*; -import com.elink.esua.epdc.smile.dto.group.form.*; -import com.elink.esua.epdc.smile.dto.group.result.*; import com.elink.esua.epdc.modules.smile.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.smile.async.NewsTask; import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient; @@ -54,6 +46,14 @@ import com.elink.esua.epdc.modules.smile.group.service.UserGroupService; import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.smile.topic.service.GroupTopicUserReadService; import com.elink.esua.epdc.modules.smile.topic.service.TopicService; +import com.elink.esua.epdc.smile.dto.constant.GroupConstant; +import com.elink.esua.epdc.smile.dto.constant.GroupNoticeConstant; +import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum; +import com.elink.esua.epdc.smile.dto.enums.GroupUserStateEnum; +import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO; +import com.elink.esua.epdc.smile.dto.group.*; +import com.elink.esua.epdc.smile.dto.group.form.*; +import com.elink.esua.epdc.smile.dto.group.result.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -694,20 +694,10 @@ public class GroupServiceImpl extends BaseServiceImpl imp @Override public List listBySection(GroupBySectionFormDTO dto) { - List dataList = baseDao.selectBySection(dto); - dataList.forEach(item -> { - UserGroupEntity entity = userGroupDao.selectGroupUserState(dto.getUserId(), item.getId()); - if (entity != null && NumConstant.TEN == entity.getState()) { - // 已通过 - item.setGroupMemberFlag(NumConstant.TWO_STR); - } else if (entity != null && NumConstant.ZERO == entity.getState()) { - // 待审核 - item.setGroupMemberFlag(NumConstant.ONE_STR); - } else { - item.setGroupMemberFlag(NumConstant.ZERO_STR); - } - }); - - return dataList; + // 获取组织结构冗余信息 + Result parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(dto.getGridId()); + DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData(); + dto.setDeptList(parentAndAllDeptDTO.getAllDeptIds().split(",")); + return baseDao.selectBySection(dto); } } diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml index b5e68a8..c4e5bd8 100644 --- a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml @@ -493,6 +493,10 @@ ORDER BY AND gp.SECTION_CODE = #{sectionCode} + AND gp.DEPT_ID IN + + #{dept} +