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

gyxtp/src/router/router.js

@@ -22,7 +22,7 @@ const routes = [
         meta: {
             title: '数据图谱',
         },
-        component: () => import ("../view/graphPageCopy.vue")
+        component: () => import ("../view/graphPageCopy0926.vue")
     },
     {
         path: '/battlefield',

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

@@ -4077,7 +4077,7 @@ public class ZhyFileManageController extends BaseController {
         if (sysUser.getRemark().equals("锁定")){
             //解锁逻辑
             sysUser.setRemark("解锁");
-            for (int i=0;i<=roles.size();i++){
+            for (int i=0;i<roles.size();i++){
                 if (roles.get(i).getRoleId().equals(1L)){
                     continue;
                 }
@@ -4124,7 +4124,7 @@ public class ZhyFileManageController extends BaseController {
 
 
 
-        for (int i=0;i<=roles.size();i++){
+        for (int i=0;i<roles.size();i++){
             if (roles.get(i).getRoleId().equals(1L)){
                 continue;
             }