|
@@ -25,6 +25,7 @@ import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo; |
|
|
import com.ningdatech.pmapi.expert.model.entity.ExpertReview; |
|
|
import com.ningdatech.pmapi.expert.model.entity.ExpertReview; |
|
|
import com.ningdatech.pmapi.expert.service.IExpertReviewService; |
|
|
import com.ningdatech.pmapi.expert.service.IExpertReviewService; |
|
|
import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; |
|
|
import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; |
|
|
|
|
|
import com.ningdatech.pmapi.gov.service.IBelongOrgService; |
|
|
import com.ningdatech.pmapi.meeting.builder.ExpertInviteBuilder; |
|
|
import com.ningdatech.pmapi.meeting.builder.ExpertInviteBuilder; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.*; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.*; |
|
|
import com.ningdatech.pmapi.meeting.entity.dto.*; |
|
|
import com.ningdatech.pmapi.meeting.entity.dto.*; |
|
@@ -43,7 +44,6 @@ import com.ningdatech.pmapi.meeting.task.ExpertRandomInviteTask; |
|
|
import com.ningdatech.pmapi.meta.helper.DictionaryCache; |
|
|
import com.ningdatech.pmapi.meta.helper.DictionaryCache; |
|
|
import com.ningdatech.pmapi.meta.helper.TagCache; |
|
|
import com.ningdatech.pmapi.meta.helper.TagCache; |
|
|
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; |
|
|
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; |
|
|
import com.ningdatech.pmapi.organization.service.IGovBusinessStripService; |
|
|
|
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
import com.ningdatech.pmapi.projectlib.service.IProjectService; |
|
|
import com.ningdatech.pmapi.projectlib.service.IProjectService; |
|
@@ -91,7 +91,7 @@ public class MeetingManage { |
|
|
private final IProjectService projectService; |
|
|
private final IProjectService projectService; |
|
|
private final IMeetingInnerProjectService meetingInnerProjectService; |
|
|
private final IMeetingInnerProjectService meetingInnerProjectService; |
|
|
private final IMeetingOuterProjectService meetingOuterProjectService; |
|
|
private final IMeetingOuterProjectService meetingOuterProjectService; |
|
|
private final IGovBusinessStripService businessStripService; |
|
|
|
|
|
|
|
|
private final IBelongOrgService belongOrgService; |
|
|
private final IDingOrganizationService dingOrganizationService; |
|
|
private final IDingOrganizationService dingOrganizationService; |
|
|
private final IExpertReviewService expertReviewService; |
|
|
private final IExpertReviewService expertReviewService; |
|
|
private final ExpertInviteHelper expertInviteHelper; |
|
|
private final ExpertInviteHelper expertInviteHelper; |
|
@@ -601,7 +601,7 @@ public class MeetingManage { |
|
|
vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); |
|
|
vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); |
|
|
vo.setAvoidUnitIds(avoidInfo.getAvoidUnitIdList()); |
|
|
vo.setAvoidUnitIds(avoidInfo.getAvoidUnitIdList()); |
|
|
if (CollUtil.isNotEmpty(vo.getAvoidOrgIds())) { |
|
|
if (CollUtil.isNotEmpty(vo.getAvoidOrgIds())) { |
|
|
vo.setAvoidOrgs(businessStripService.listNameByCodes(avoidInfo.getAvoidOrgIdList())); |
|
|
|
|
|
|
|
|
vo.setAvoidOrgs(belongOrgService.listNameByCodes(avoidInfo.getAvoidOrgIdList())); |
|
|
} |
|
|
} |
|
|
if (CollUtil.isNotEmpty(vo.getAvoidUnitIds())) { |
|
|
if (CollUtil.isNotEmpty(vo.getAvoidUnitIds())) { |
|
|
vo.setAvoidUnits(dingOrganizationService.listNameByCodes(avoidInfo.getAvoidUnitIdList())); |
|
|
vo.setAvoidUnits(dingOrganizationService.listNameByCodes(avoidInfo.getAvoidUnitIdList())); |
|
|