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) {