From 57937bf7043b9117149f8772a1f67490043abb60 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Sun, 23 Feb 2025 12:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E6=A0=A1=E3=80=81?= =?UTF-8?q?=E6=9C=AC=E6=A0=A1=E8=80=81=E5=B8=88=E5=92=8C=E7=A0=94=E7=A9=B6?= =?UTF-8?q?=E7=94=9F=E7=AE=A1=E7=90=86=E7=9A=84list=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=AD=A6=E7=A7=91=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../niefy/modules/h5/entity/H5WaiTeacher.java | 4 ++- .../impl/H5LocalTeacherServiceImpl.java | 24 +++++++++---- .../h5/service/impl/H5StudentServiceImpl.java | 34 ++++++++++++------- .../service/impl/H5WaiTeacherServiceImpl.java | 3 +- 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/github/niefy/modules/h5/entity/H5WaiTeacher.java b/src/main/java/com/github/niefy/modules/h5/entity/H5WaiTeacher.java index 19c12b16..1782785a 100644 --- a/src/main/java/com/github/niefy/modules/h5/entity/H5WaiTeacher.java +++ b/src/main/java/com/github/niefy/modules/h5/entity/H5WaiTeacher.java @@ -29,7 +29,9 @@ public class H5WaiTeacher implements Serializable { */ // 不需要导出这个字段 private String openId; -// 专业 + /** + * 专业id,0表示未选择,1为语文,4为地理,7为历史,8为政治 + */ private Integer majorId; /** diff --git a/src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java b/src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java index df9457a2..0d6e39f4 100644 --- a/src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java +++ b/src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java @@ -51,6 +51,7 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl userPermissions = shiroServiceImpl.getUserPermissions(PUserId); boolean containsy = userPermissions.contains("wai:user:listy"); boolean containsd = userPermissions.contains("wai:user:listd"); @@ -58,19 +59,19 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl30){ - return queryPageUser(params, userName,0,sortOrder,sortField); + return queryPageUser(params, userName,0,sortOrder,sortField,arr); }else if(containsy){ // 查看语文学科人 - return queryPageUser(params, userName,1,sortOrder,sortField); + return queryPageUser(params, userName,1,sortOrder,sortField,arr); // 地理学科 }else if (containsd){ - return queryPageUser(params, userName,4,sortOrder,sortField); + return queryPageUser(params, userName,4,sortOrder,sortField,arr); // 历史 }else if (containsl){ - return queryPageUser(params, userName,7,sortOrder,sortField); + return queryPageUser(params, userName,7,sortOrder,sortField,arr); // 政治 }else if (containsz){ - return queryPageUser(params, userName,8,sortOrder,sortField); + return queryPageUser(params, userName,8,sortOrder,sortField,arr); } return null; @@ -126,9 +127,10 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl params, String userName, Integer majorId, String sortOrder, String sortField) { + public PageUtils queryPageUser(Map params, String userName, Integer majorId, String sortOrder, String sortField, String arr) { QueryWrapper queryWrapper = new QueryWrapper<>(); - +// 按照,来分隔 + String[] list = arr.split(","); if (majorId == 0) { if (StringUtils.isNotBlank(userName)) { queryWrapper.like("user_name", userName); @@ -144,7 +146,15 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl 0 && list[0] != null && !list[0].equals("")) { +// params.put("limit", "400"); + } + for (String s : list) { + queryWrapper.like("major_id", s); + } // 字段映射 String s = H5Util.mapSortField(sortField); diff --git a/src/main/java/com/github/niefy/modules/h5/service/impl/H5StudentServiceImpl.java b/src/main/java/com/github/niefy/modules/h5/service/impl/H5StudentServiceImpl.java index 7e7a27df..6e0e2968 100644 --- a/src/main/java/com/github/niefy/modules/h5/service/impl/H5StudentServiceImpl.java +++ b/src/main/java/com/github/niefy/modules/h5/service/impl/H5StudentServiceImpl.java @@ -50,26 +50,27 @@ public class H5StudentServiceImpl extends ServiceImpl userPermissions = shiroServiceImpl.getUserPermissions(PUserId); boolean containsy = userPermissions.contains("wai:user:listy"); boolean containsd = userPermissions.contains("wai:user:listd"); boolean containsl = userPermissions.contains("wai:user:listl"); boolean containsz = userPermissions.contains("wai:user:listz"); // 如果是管理源看到所有人 - if (userPermissions.size()>30){ - return queryPageUser(params, userName,0,sortOrder,sortField); - }else if(containsy){ + if (userPermissions.size() > 30) { + return queryPageUser(params, userName, 0, sortOrder, sortField, arr); + } else if (containsy) { // 查看语文学科人 - return queryPageUser(params, userName,1,sortOrder,sortField); + return queryPageUser(params, userName, 1, sortOrder, sortField, arr); // 地理学科 - }else if (containsd){ - return queryPageUser(params, userName,4,sortOrder,sortField); + } else if (containsd) { + return queryPageUser(params, userName, 4, sortOrder, sortField, arr); // 历史 - }else if (containsl){ - return queryPageUser(params, userName,7,sortOrder,sortField); + } else if (containsl) { + return queryPageUser(params, userName, 7, sortOrder, sortField, arr); // 政治 - }else if (containsz){ - return queryPageUser(params, userName,8,sortOrder,sortField); + } else if (containsz) { + return queryPageUser(params, userName, 8, sortOrder, sortField, arr); } return null; @@ -104,9 +105,10 @@ public class H5StudentServiceImpl extends ServiceImpl params, String userName, Integer majorId, String sortOrder, String sortField) { + public PageUtils queryPageUser(Map params, String userName, Integer majorId, String sortOrder, String sortField, String arr) { QueryWrapper queryWrapper = new QueryWrapper<>(); - +// 按照,来分隔 + String[] list = arr.split(","); // 添加条件查询 if (majorId != null && majorId != 0) { queryWrapper.eq("major_id", majorId); @@ -119,7 +121,15 @@ public class H5StudentServiceImpl extends ServiceImpl 0 && list[0] != null && !list[0].equals("")) { +// params.put("limit", "5"); + } + for (String s : list) { + queryWrapper.like("major_id", s); + } // 字段映射 String s = H5Util.mapSortField(sortField); diff --git a/src/main/java/com/github/niefy/modules/h5/service/impl/H5WaiTeacherServiceImpl.java b/src/main/java/com/github/niefy/modules/h5/service/impl/H5WaiTeacherServiceImpl.java index eb58ddf7..5e94e21c 100644 --- a/src/main/java/com/github/niefy/modules/h5/service/impl/H5WaiTeacherServiceImpl.java +++ b/src/main/java/com/github/niefy/modules/h5/service/impl/H5WaiTeacherServiceImpl.java @@ -237,9 +237,10 @@ public class H5WaiTeacherServiceImpl extends ServiceImpl 0 && list[0] != null && !list[0].equals("")) { - params.put("limit", "400"); +// params.put("limit", "400"); } for (String s : list) {