From e458ea07b747222648dad0f58cd514d91e764238 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sun, 23 Apr 2023 11:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=85=B3=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java | 2 +- .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java index 596eea4..9b43890 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingOptionProjectReq.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * @since 11:50 2023/3/16 */ @Data -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = true) public class MeetingOptionProjectReq extends PagePo { private String meetingType; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 434460f..fd3a36b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -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.vo.*; 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.MeetingManageHelper; import com.ningdatech.pmapi.meeting.helper.YxtCallOrSmsHelper; import com.ningdatech.pmapi.meeting.service.*; import com.ningdatech.pmapi.meeting.task.ExpertRandomInviteTask; @@ -854,6 +854,9 @@ public class MeetingManage { default: return PageVo.empty(); } + UserInfoDetails userDetail = LoginUserUtil.loginUserDetail(); + Collection regionCodes = regionCache.listChildRegionCodeList(userDetail.getRegionCode(), userDetail.getRegionLevel()); + query.in(Project::getAreaCode, regionCodes); Page page = projectService.page(req.page(), query); PageVo result = PageVo.of(null, page.getTotal()); if (result.getTotal() > 0) {