18792927508 1 год назад
Родитель
Сommit
33b4ba3972

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java Просмотреть файл

143
     }
143
     }
144
 
144
 
145
     public static void main(String[] args) {
145
     public static void main(String[] args) {
146
-        System.out.println( MD5.create().digestHex("BMceshi" ));
146
+        System.out.println( MD5.create().digestHex("BM456" ));
147
     }
147
     }
148
 }
148
 }
149
 
149
 

+ 13
- 1
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java Просмотреть файл

8
 import com.ruoyi.common.core.text.Convert;
8
 import com.ruoyi.common.core.text.Convert;
9
 import com.ruoyi.common.utils.SecurityUtils;
9
 import com.ruoyi.common.utils.SecurityUtils;
10
 import com.ruoyi.common.utils.StringUtils;
10
 import com.ruoyi.common.utils.StringUtils;
11
+import com.ruoyi.common.utils.spring.SpringUtils;
11
 import com.ruoyi.framework.security.context.PermissionContextHolder;
12
 import com.ruoyi.framework.security.context.PermissionContextHolder;
13
+import com.ruoyi.system.mapper.SysRoleMapper;
12
 import org.aspectj.lang.JoinPoint;
14
 import org.aspectj.lang.JoinPoint;
13
 import org.aspectj.lang.annotation.Aspect;
15
 import org.aspectj.lang.annotation.Aspect;
14
 import org.aspectj.lang.annotation.Before;
16
 import org.aspectj.lang.annotation.Before;
55
      * 数据权限过滤关键字
57
      * 数据权限过滤关键字
56
      */
58
      */
57
     public static final String DATA_SCOPE = "dataScope";
59
     public static final String DATA_SCOPE = "dataScope";
60
+    private  static SysRoleMapper roleMapper;
61
+
62
+
63
+    static {
64
+        roleMapper= SpringUtils.getBean(SysRoleMapper.class);
65
+
66
+    }
67
+
58
 
68
 
59
     @Before("@annotation(controllerDataScope)")
69
     @Before("@annotation(controllerDataScope)")
60
     public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
70
     public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
93
     {
103
     {
94
         StringBuilder sqlString = new StringBuilder();
104
         StringBuilder sqlString = new StringBuilder();
95
         List<String> conditions = new ArrayList<String>();
105
         List<String> conditions = new ArrayList<String>();
96
-
106
+        if(user.getUserId()!=null){
107
+            user.setRoles(roleMapper.selectRolePermissionByUserId(user.getUserId()));
108
+        }
97
         for (SysRole role : user.getRoles())
109
         for (SysRole role : user.getRoles())
98
         {
110
         {
99
             String dataScope = role.getDataScope();
111
             String dataScope = role.getDataScope();

+ 12
- 1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java Просмотреть файл

1
 package com.ruoyi.framework.web.service;
1
 package com.ruoyi.framework.web.service;
2
 
2
 
3
 import cn.hutool.core.util.ObjectUtil;
3
 import cn.hutool.core.util.ObjectUtil;
4
+import cn.hutool.core.util.StrUtil;
4
 import cn.hutool.crypto.digest.MD5;
5
 import cn.hutool.crypto.digest.MD5;
5
 import com.ruoyi.common.constant.CacheConstants;
6
 import com.ruoyi.common.constant.CacheConstants;
6
 import com.ruoyi.common.constant.Constants;
7
 import com.ruoyi.common.constant.Constants;
250
                 user.setEmail(username);
251
                 user.setEmail(username);
251
             }
252
             }
252
             // 根据角色名查询角色id
253
             // 根据角色名查询角色id
253
-            Long roleIdByName = roleMapper.selectRoleIdByName(loginBody.getRoleName());
254
+            String roleName = loginBody.getRoleName();
255
+            if (StrUtil.isNotEmpty(roleName)){
256
+                if(roleName.contains("被申请人")){
257
+                roleName="被申请人操作人";
258
+                }else if(roleName.contains("申请人")){
259
+                roleName="申请人操作人";
260
+                }else if(roleName.contains("委托代理人")){
261
+                    roleName="第三方代理操作人";
262
+                }
263
+            }
264
+            Long roleIdByName = roleMapper.selectRoleIdByName(roleName);
254
             if(roleIdByName==null){
265
             if(roleIdByName==null){
255
                 return AjaxResult.error("角色不存在");
266
                 return AjaxResult.error("角色不存在");
256
             }
267
             }