提交代码

ruoyi-admin/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: prod
   # 文件上传
   servlet:
     multipart:

ruoyi-ui/src/views/system/user/index.vue

@@ -21,7 +21,9 @@
             :filter-node-method="filterNode"
             ref="tree"
             node-key="id"
-            default-expand-all
+            accordion
+            default-expanded-keys=[100]
+            default-expand-all="false"
             highlight-current
             @node-click="handleNodeClick"
           />
@@ -440,6 +442,9 @@ export default {
       ],
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "用户部门不能为空", trigger: "blur" }
+        ],
         userName: [
           { required: true, message: "登录账号不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur' }
@@ -451,6 +456,9 @@ export default {
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
+        roleIds: [
+          { required: true, message: "用户角色不能为空", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java

@@ -34,6 +34,8 @@ public class ProjectCheckingController extends BaseController {
         if(surProjectChecking.getDeptId()==0){
             surProjectChecking.setDeptId(null);
         }
+        //启用分页
+        startPage();
         return success(surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking));
     }
 

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java

@@ -34,6 +34,8 @@ public class ProjectDetectionController extends BaseController {
         if(surProjectCheckDetection.getDeptId()==0){
             surProjectCheckDetection.setDeptId(null);
         }
+        //启用分页
+        startPage();
         return success(surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection));
     }
 

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java

@@ -33,6 +33,8 @@ public class ProjectMaterialSealController extends BaseController {
         if(surProjectMaterialSeal.getDeptId()==0){
             surProjectMaterialSeal.setDeptId(null);
         }
+        //启用分页
+        startPage();
         return success(surProjectMaterialSealService.selectSurProjectMaterialSealList(surProjectMaterialSeal));
     }
 

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java

@@ -34,6 +34,8 @@ public class ProjectMeasureController extends BaseController {
         if(surProjectMeasure.getDeptId()==0){
             surProjectMeasure.setDeptId(null);
         }
+        //启用分页
+        startPage();
         return success(surProjectMeasureService.selectSurProjectMeasureList(surProjectMeasure));
     }
 

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "jxz"'> and (spcd.approve_status != '4' or spcd.approve_status is null)</if>
             <if test='activeName == "ywc"'> and spcd.approve_status = '4'</if>
         </where>
-        order by spcd.approve_status, spcd.check_time desc
+        order by spcd.approve_status, spcd.id desc
     </select>
 
     <select id="queryGroupCount" parameterType="SurProjectCheckDetection" resultType="map">

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "jxz"'> and spc.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spc.approve_status = '4'</if>
         </where>
-        order by checking_date desc
+        order by soc.approve_status, spc.id desc
     </select>
 
     <select id="selectBgscreenProjectCheckingList" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">

yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml

@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "jxz"'> and spme.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spme.approve_status = '4'</if>
         </where>
+        order by spme.approve_status, spme.id desc
     </select>
 
     <select id="findGroupCountByProjectId" parameterType="Long" resultType="map">

yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml

@@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "jxz"'> and spm.approve_status != '4'</if>
             <if test='activeName == "ywc"'> and spm.approve_status = '4'</if>
         </where>
+        order by spm.approve_status, spm.id desc
     </select>
 
     <select id="findGroupCountByProjectId" parameterType="Long" resultType="map">