Browse Source

会议关联项目增加区域限制

tags/24080901
WendyYang 1 year ago
parent
commit
e458ea07b7
2 changed files with 5 additions and 2 deletions
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java
  2. +4
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java View File

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
* @since 11:50 2023/3/16 * @since 11:50 2023/3/16
*/ */
@Data @Data
@EqualsAndHashCode
@EqualsAndHashCode(callSuper = true)
public class MeetingOptionProjectReq extends PagePo { public class MeetingOptionProjectReq extends PagePo {


private String meetingType; private String meetingType;


+ 4
- 1
pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java View File

@@ -35,8 +35,8 @@ import com.ningdatech.pmapi.meeting.entity.enumeration.MeetingStatusEnum;
import com.ningdatech.pmapi.meeting.entity.req.*; import com.ningdatech.pmapi.meeting.entity.req.*;
import com.ningdatech.pmapi.meeting.entity.vo.*; import com.ningdatech.pmapi.meeting.entity.vo.*;
import com.ningdatech.pmapi.meeting.helper.ExpertInviteHelper; import com.ningdatech.pmapi.meeting.helper.ExpertInviteHelper;
import com.ningdatech.pmapi.meeting.helper.MeetingManageHelper;
import com.ningdatech.pmapi.meeting.helper.MeetingCallOrMsgHelper; import com.ningdatech.pmapi.meeting.helper.MeetingCallOrMsgHelper;
import com.ningdatech.pmapi.meeting.helper.MeetingManageHelper;
import com.ningdatech.pmapi.meeting.helper.YxtCallOrSmsHelper; import com.ningdatech.pmapi.meeting.helper.YxtCallOrSmsHelper;
import com.ningdatech.pmapi.meeting.service.*; import com.ningdatech.pmapi.meeting.service.*;
import com.ningdatech.pmapi.meeting.task.ExpertRandomInviteTask; import com.ningdatech.pmapi.meeting.task.ExpertRandomInviteTask;
@@ -854,6 +854,9 @@ public class MeetingManage {
default: default:
return PageVo.empty(); return PageVo.empty();
} }
UserInfoDetails userDetail = LoginUserUtil.loginUserDetail();
Collection<String> regionCodes = regionCache.listChildRegionCodeList(userDetail.getRegionCode(), userDetail.getRegionLevel());
query.in(Project::getAreaCode, regionCodes);
Page<Project> page = projectService.page(req.page(), query); Page<Project> page = projectService.page(req.page(), query);
PageVo<MeetingReviewProjectVO> result = PageVo.of(null, page.getTotal()); PageVo<MeetingReviewProjectVO> result = PageVo.of(null, page.getTotal());
if (result.getTotal() > 0) { if (result.getTotal() > 0) {


Loading…
Cancel
Save