finish rbac rebuild

jzfai · May 22, 2023 · 5f9d9d3 · 5f9d9d3
1 parent b295085
commit 5f9d9d3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/hugo-admin/src/main/resources/application.yml b/hugo-admin/src/main/resources/application.yml
@@ -42,6 +42,7 @@ spring:
     deserialization:
       # 允许对象忽略json中不存在的属性
       fail_on_unknown_properties: false
+    default-property-inclusion: non_null
 
 
 

diff --git a/hugo-system/src/main/java/top/hugo/system/service/SysMenuService.java b/hugo-system/src/main/java/top/hugo/system/service/SysMenuService.java
@@ -124,8 +124,17 @@ public Set<String> selectMenuPermsByRoleId(Long roleId) {
      */
     @Transactional
     public int insertMenu(SysMenu menu) {
-        validRouteName(menu);
-        validPermissionCode(menu);
+        List<String> routerNameArr = Arrays.asList("M", " C");
+        if (!menu.getMenuType().equals("M")) {
+            validPermissionCode(menu);
+
+        }
+
+        if (!menu.getMenuType().equals("F")) {
+            validRouteName(menu);
+        }
+
+
         return sysMenuMapper.insert(menu);
     }
 
@@ -179,8 +188,13 @@ public void validPermissionCode(SysMenu menu) {
      */
     @Transactional
     public int updateMenu(SysMenu menu) {
-        validRouteName(menu);
-        validPermissionCode(menu);
+        if (!menu.getMenuType().equals("M")) {
+            validPermissionCode(menu);
+
+        }
+        if (!menu.getMenuType().equals("F")) {
+            validRouteName(menu);
+        }
         return sysMenuMapper.updateById(menu);
     }