登录接口返回学校ID

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,"用户权限不正确");

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<DocInfo> list2(@RequestBody DocInfo docInfo,
-                               @RequestParam(defaultValue = "0") int page,
+                               @RequestParam(required = false) Integer page,
-                               @RequestParam(defaultValue = "10") int size) {
+                               @RequestParam(required = false) Integer size) {
         List<String> schoolIds = Arrays.asList("管理员", docInfo.getSchoolId()); // 构建 schoolId 列表
 
         //创建查询条件