From 3ba06fd16eb906872f50a771f151a7fe765ff77b Mon Sep 17 00:00:00 2001 From: yangxinyu Date: Thu, 11 Dec 2025 18:08:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=20use?= =?UTF-8?q?rId=20=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/api/StudySignupApi.java | 4 +++- .../school/study/service/impl/StudyCourseServiceImpl.java | 4 +++- .../school/study/service/impl/StudySignupServiceImpl.java | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java index 02e9cfef..a6b974d1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java @@ -65,13 +65,15 @@ public class StudySignupApi extends ApiBaseController{ * @return 返回课程报名表的集合 */ @PostMapping("/pagelist") - public JsonResponse> findPage(Pagination pager, String courseId, String name, Integer signType) { + public JsonResponse> findPage(Pagination pager, String courseId, String name, Integer signType,String aid) { // if(StringUtils.isBlank(courseId)){ // return error("无课程信息"); // } StudySignup ss=new StudySignup(); ss.setCourseId(courseId); ss.setName(name); + //25.12.11 新增aid筛选 + ss.setAid(aid); //2025.11.28 新增signType筛选 ss.setSignType(signType); //CurrentUser cuser=getCurrent(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index 9951628a..555c2888 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -159,8 +159,10 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ if(sc.getStartTime()!=null){ query.addFilter(FieldFilters.eq("startTime",sc.getStartTime())); } + //25.12.11新增：添加根据用户aid通过逗号分隔查询 if(StringUtils.isNotBlank(sc.getAid())) { - query.addFilter(FieldFilters.eq("aid", sc.getAid())); + String userIdStr=sc.getAid(); + query.addFilter(FieldFilters.in("aid",userIdStr.split(","))); } } // 原有查询是否结束逻辑 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java index e4380c38..8c4cd1e1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java @@ -223,9 +223,11 @@ public class StudySignupServiceImpl implements IStudySignupService{ if(ss.getCourseType()!=null) { query.addFilter(FieldFilters.eq("courseType", ss.getCourseType())); } - if(StringUtils.isNotBlank(ss.getAid())) { - query.addFilter(FieldFilters.eq("aid", ss.getAid())); - } + //25.12.11新增：添加根据用户aid通过逗号分隔查询 + if(StringUtils.isNotBlank(ss.getAid())){ + String userIdStr = ss.getAid(); + query.addFilter(FieldFilters.in("aid",userIdStr.split(","))); + } // 25.11.26新增：添加根据报名方式查询（1自主报名，2管理代报） if (ss.getSignType() != null) { query.addFilter(FieldFilters.eq("signType", ss.getSignType()));