Merge branch 'small-tupu' of http://124.70.32.114:3100/jianzhenyu/Changsha_tupu into hanyuqing

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

@@ -4073,17 +4073,66 @@ public class ZhyFileManageController extends BaseController {
     @GetMapping("/lockAll")
     public AjaxResult lockAll(){
         SysUser sysUser = sysUserMapper.selectUserById(getUserId());
+        List<SysRole> roles = roleService.selectRoleAll();
         if (sysUser.getRemark().equals("锁定")){
             //解锁逻辑
             sysUser.setRemark("解锁");
+            for (int i=0;i<=roles.size();i++){
+                if (roles.get(i).getRoleId().equals(1L)){
+                    continue;
+                }
+                SysRole role = roles.get(i);
+                Long[] menus = {
+                        1122L, 1066L, 1145L, 1146L, 1147L, 1148L,
+                        1149L, 1150L, 1136L, 1137L, 1138L, 1140L,
+                        1123L, 1142L, 1144L, 1152L, 1153L, 1155L,
+                        1156L, 1143L, 1157L, 1158L, 1160L, 1161L,1162L
+                };
+                role.setMenuIds(menus);
+
+                roleService.checkRoleAllowed(role);
+                roleService.checkRoleDataScope(role.getRoleId());
+                if (!roleService.checkRoleNameUnique(role))
+                {
+                    return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+                }
+                else if (!roleService.checkRoleKeyUnique(role))
+                {
+                    return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+                }
+                role.setUpdateBy(getUsername());
 
-            SysRole role = new SysRole();
+                if (roleService.updateRole(role) > 0)
-            role = roleService.selectRoleById(2l);
+                {
+                    // 更新缓存用户权限
+                    LoginUser loginUser = getLoginUser();
+                    if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+                    {
+                        loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                        loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                        tokenService.setLoginUser(loginUser);
+                    }
+                }
+            }
+            sysUserMapper.updateUser(sysUser);
+            return AjaxResult.success("解锁成功");
+        }
+
+
+
+
+
+
+
+        for (int i=0;i<=roles.size();i++){
+            if (roles.get(i).getRoleId().equals(1L)){
+                continue;
+            }
+            SysRole role = roles.get(i);
             Long[] menus = {
-                    1122L, 1066L, 1145L, 1146L, 1147L, 1148L,
+                    1122L, 1066L, 1136L, 1137L, 1123L,
-                    1149L, 1150L, 1136L, 1137L, 1138L, 1140L,
+                    1142L, 1144L, 1152L, 1156L, 1143L,
-                    1123L, 1142L, 1144L, 1152L, 1153L, 1155L,
+                    1157L, 1161L
-                    1156L, 1143L, 1157L, 1158L, 1160L, 1161L,1162L
             };
             role.setMenuIds(menus);
 
@@ -4109,56 +4158,7 @@ public class ZhyFileManageController extends BaseController {
                     loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                     tokenService.setLoginUser(loginUser);
                 }
-
             }
-
-
-
-            sysUserMapper.updateUser(sysUser);
-            return AjaxResult.success("解锁成功");
-        }
-
-
-
-
-
-
-
-
-
-
-        SysRole role = new SysRole();
-        role = roleService.selectRoleById(2l);
-        Long[] menus = {
-                1122L, 1066L, 1136L, 1137L, 1123L,
-                1142L, 1144L, 1152L, 1156L, 1143L,
-                1157L, 1161L
-        };
-        role.setMenuIds(menus);
-
-        roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
-        if (!roleService.checkRoleNameUnique(role))
-        {
-            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (!roleService.checkRoleKeyUnique(role))
-        {
-            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setUpdateBy(getUsername());
-
-        if (roleService.updateRole(role) > 0)
-        {
-            // 更新缓存用户权限
-            LoginUser loginUser = getLoginUser();
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
-            {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
-                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
-            }
-
         }
         sysUser.setRemark("锁定");
         sysUserMapper.updateUser(sysUser);