1.菜单权限问题

blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/GrantTreeVO.java

@@ -26,12 +26,18 @@ public class GrantTreeVO implements Serializable {
     //档案菜单
     private List<TreeNodeVO> archivesMenu;
 
-    // 内控系统
+    //内控系统
     private List<TreeNodeVO> hacMenu;
 
     //征拆系统
     private List<TreeNodeVO> larMenu;
 
+    //计量系统
+    private List<TreeNodeVO> measureMenu;
+
+    //安全系统
+    private List<TreeNodeVO> secureMenu;
+
     //数据
     private List<TreeNodeVO> dataScope;
 

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -231,6 +231,9 @@ public class MenuController extends BladeController {
         List<TreeNodeVO> treeMenuArchives = new ArrayList<>(); //档案
         List<TreeNodeVO> treeMenuHac = new ArrayList<>(); //内控系统
         List<TreeNodeVO> treeMenuLar = new ArrayList<>(); //征拆系统
+        List<TreeNodeVO> treeMenuMeasure = new ArrayList<>(); //计量
+        List<TreeNodeVO> treeMenuSecure = new ArrayList<>(); //安全
+
         //获取所有菜单
         List<TreeNodeVO> treeNodesAll = menuService.grantTree(user);
         //获取AuthClient
@@ -258,17 +261,29 @@ public class MenuController extends BladeController {
                         }
                     }
                     if (("hac").equals(authClient.getClientId())) {
-                        //档案
+                        //内控
                         if (treeNode.getSysId().equals(authClient.getId())) {
                             treeMenuHac.add(treeNode);
                         }
                     }
                     if (("lar").equals(authClient.getClientId())) {
-                        //档案
+                        //征拆
                         if (treeNode.getSysId().equals(authClient.getId())) {
                             treeMenuLar.add(treeNode);
                         }
                     }
+                    if (("measure").equals(authClient.getClientId())) {
+                        //计量
+                        if (treeNode.getSysId().equals(authClient.getId())) {
+                            treeMenuMeasure.add(treeNode);
+                        }
+                    }
+                    if (("secure").equals(authClient.getClientId())) {
+                        //安全
+                        if (treeNode.getSysId().equals(authClient.getId())) {
+                            treeMenuSecure.add(treeNode);
+                        }
+                    }
                     //TODO 其他菜单权限
                 }
             }
@@ -291,6 +306,10 @@ public class MenuController extends BladeController {
         //表单
         List<DictVO02> ownerType = dictService.getList2("owner_type");
         vo.setTableOwners(ownerType);
+        //计量
+        vo.setMeasureMenu(treeMenuMeasure);
+        //安全
+        vo.setSecureMenu(treeMenuSecure);
 
         return R.data(vo);
     }