From e0b1466d4846377b3210f01d05c8dbd5b8e7affe Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 26 Feb 2025 11:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AD=A6=E6=A0=A1ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/system/SysLoginController.java | 3 +++ .../ruoyi/biemo/business/controller/DocInfoController.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 71794cf..dc68065 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -102,6 +102,9 @@ public class SysLoginController { ajax.put(Constants.TOKEN, token); ajax.put("deptId",user.getDeptId()); ajax.put("UserId",user.getUserId()); + SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId()); + Long parentId = sysDept.getParentId(); + ajax.put("schoolId",parentId.toString()); //学校ID return ajax; } return new AjaxResult(403,"用户权限不正确"); diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java index fda6cdd..1f77106 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java @@ -98,8 +98,8 @@ public class DocInfoController extends BaseController { //todo 新查询，不使用ES，直接查询mongo page从0开始 @PostMapping("/list") public Page list2(@RequestBody DocInfo docInfo, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "10") int size) { + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer size) { List schoolIds = Arrays.asList("管理员", docInfo.getSchoolId()); // 构建 schoolId 列表 //创建查询条件