1

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -40,6 +40,11 @@ public class TableDataInfo<T> implements Serializable {
     private String msg;
 
     /**
+     * 总页码
+     */
+    private long pages;
+
+    /**
      * 分页
      *
      * @param list  列表数据
@@ -56,6 +61,7 @@ public class TableDataInfo<T> implements Serializable {
         rspData.setMsg("查询成功");
         rspData.setRows(page.getRecords());
         rspData.setTotal(page.getTotal());
+        rspData.setPages(page.getPages());
         return rspData;
     }
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,6 +24,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="deptList" column="dept_list"/>
         <association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
 
@@ -103,11 +104,12 @@
                r.role_key,
                r.role_sort,
                r.data_scope,
-               r.status as role_status
+               r.status as role_status,
+               u.dept_list
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user_role sur on u.user_id = sur.user_id
-            left join sys_role r on r.role_id = sur.role_id
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
     </sql>
 
     <select id="selectPageUserList" resultMap="SysUserResult">

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbBannerController.java

@@ -15,7 +15,6 @@ import com.ruoyi.school.paper.domain.vo.DbBannerVo;
 import com.ruoyi.school.paper.service.IDbBannerService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -110,7 +109,8 @@ public class DbBannerController extends BaseController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/uploadFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
+    @CrossOrigin
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
     public R upload(@RequestPart("file") MultipartFile file) {
         if (!file.isEmpty()) {
             String uploadPath = "C:\\Users\\Administrator\\Pictures\\";

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperServiceImpl.java

@@ -56,15 +56,18 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
     public TableDataInfo<DbTestPaperVo> queryPageList(DbTestPaperBo bo, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
         SysUser sysUser = userService.selectUserById(userId);
-        LambdaQueryWrapper<DbTestPaper> lqw = buildQueryWrapper(bo);
         if (sysUser.getSex().equals("0")) {
             List<String> colList = CollUtil.newArrayList(sysUser.getDeptList().split(","));
             List<SysDept> sysDepts = deptService.selectDeptListByList(colList.stream().mapToLong(t -> Long.parseLong(t.trim())).boxed().collect(Collectors.toList()));
-            SysDept sysDept = sysDepts.stream().filter(dept -> dept.getParentId().equals(0L)).findAny().orElse(null);
-            if (sysDept != null) {
-
+            SysDept dept = sysDepts.stream().filter(depts -> !depts.getParentId().equals(0L)).findAny().orElse(null);
+            if (dept != null) {
+                bo.setPhaseId(dept.getParentId());
+            }
+            if (dept != null) {
+                bo.setClassId(dept.getDeptId());
             }
         }
+        LambdaQueryWrapper<DbTestPaper> lqw = buildQueryWrapper(bo);
         Page<DbTestPaperVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }