Ver código fonte

修改菜单权限表和字段

wangliang 3 anos atrás
pai
commit
275b0c92b5

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/MenuCustomController.java

@@ -68,7 +68,7 @@ public class MenuCustomController {
                 .eq(SysPrivilege::getDisplay, true)
                 .eq(SysPrivilege::getDefaultAuth, false)
                 .ne(SysPrivilege::getType, PrivilegeEnum.URL)
-                .notIn(SysPrivilege::getUrl, Arrays.asList(SystemConstant.MENU_MANAGE, SystemConstant.CUSTOM_MENU));
+                .notIn(SysPrivilege::getId, SystemConstant.MENU_MANAGE);
         List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
         List<PrivilegeDto> privilegeDtoList = null;
         if (Objects.nonNull(sysPrivilegeList) && sysPrivilegeList.size() > 0) {

+ 2 - 6
teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -7,9 +7,7 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.Objects;
-import java.util.StringJoiner;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @Description: 系统常量
@@ -81,9 +79,7 @@ public class SystemConstant {
     public static final String REGULAR_EXPRESSION_OF_CODE = "[a-zA-Z0-9](\\w+)?-?(\\w+)?—?(\\w+)?(\\((\\w+)?-?(\\w+)?—?(\\w+)?\\))?(\\((\\w+)?-?(\\w+)?—?(\\w+)?\\))?(\\w+)?";
     public static final String REGULAR_EXPRESSION_OF_PHONE = "((\\d{3,4})|(\\(\\d{3,4}\\)-))?\\d{7,8}";
     public static final String SYS_USER = "sysUser";
-//    public static final Long DEFAULT_PRIVILEGE_SCHOOL = 137L;
-    public static final String MENU_MANAGE = "MenuManage";
-    public static final String CUSTOM_MENU = "CustomMenu";
+    public static final List<Long> MENU_MANAGE = Arrays.asList(507L, 508L, 530L, 531L);
 
     /**
      * oss url过期时间