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,12 +4073,15 @@ 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("解锁");
-
-            SysRole role = new SysRole();
-            role = roleService.selectRoleById(2l);
+            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,
@@ -4109,11 +4112,8 @@ public class ZhyFileManageController extends BaseController {
                         loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                         tokenService.setLoginUser(loginUser);
                     }
-
                 }
-
-
-
+            }
             sysUserMapper.updateUser(sysUser);
             return AjaxResult.success("解锁成功");
         }
@@ -4124,11 +4124,11 @@ public class ZhyFileManageController extends BaseController {
 
 
 
-
-
-
-        SysRole role = new SysRole();
-        role = roleService.selectRoleById(2l);
+        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, 1136L, 1137L, 1123L,
                     1142L, 1144L, 1152L, 1156L, 1143L,
@@ -4158,7 +4158,7 @@ public class ZhyFileManageController extends BaseController {
                     loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                     tokenService.setLoginUser(loginUser);
                 }
-
+            }
         }
         sysUser.setRemark("锁定");
         sysUserMapper.updateUser(sysUser);