用户权限调整

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -76,7 +76,7 @@ public class SysLoginController extends BaseController
         return "login";
     }
 
-    @PostMapping("/login")
+/*    @PostMapping("/login")
     @ResponseBody
     public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
     {
@@ -96,7 +96,7 @@ public class SysLoginController extends BaseController
             }
             return error(msg);
         }
-    }
+    }*/
 
     /**
      * 发送短信验证码
@@ -156,6 +156,7 @@ public class SysLoginController extends BaseController
 
             if (sendResult)
             {
+                System.out.println(smsCode);
                 // 记录发送日志，不需要记录日志
                 //AsyncManager.me().execute(AsyncFactory.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "短信验证码发送成功"));
                 return success("验证码发送成功");

ruoyi-admin/src/main/resources/mapper/project/TrsFileInfoMapper.xml

@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTrsFileInfoVo"/>
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
-            --             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
-            LEFT JOIN sys_user d ON t.user_id = d.user_id
+            LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>
             <if test="docname != null  and docname != ''"> and docname like concat('%', #{docname}, '%')</if>

ruoyi-admin/src/main/resources/mapper/project/TrsPolicyWordsMapper.xml

@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
+
         </if>
         <where>  
             <if test="wrongWord != null  and wrongWord != ''"> and wrong_word like concat('%', #{wrongWord}, '%')</if>

ruoyi-admin/src/main/resources/mapper/project/TrsSensitiveWordsMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>  
             <if test="wrongWord != null  and wrongWord != ''"> and wrong_word like concat('%', #{wrongWord}, '%')</if>
@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>
             and flag = 0
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         where id = #{id}
         <!-- 数据范围过滤 -->