Sfoglia il codice sorgente

update SelectDictAttrProcessor

reghao 1 anno fa
parent
commit
bbe7e96bff

+ 0 - 2
web/src/main/java/cn/reghao/devops/web/admin/account/model/constant/RoleType.java

@@ -9,8 +9,6 @@ package cn.reghao.devops.web.admin.account.model.constant;
 public enum RoleType {
     ROLE_ADMIN("管理员"),
     ROLE_USER("普通用户"),
-    ROLE_DEVOPS("运维"),
-    ROLE_DEVELOP("开发"),
     ROLE_JAVA("Java 开发"),
     ROLE_DOTNET("DotNet 开发"),
     ROLE_NPM("前端开发");

+ 3 - 4
web/src/main/java/cn/reghao/devops/web/template/attribute/SelectDictAttrProcessor.java

@@ -72,12 +72,11 @@ public class SelectDictAttrProcessor extends AbstractAttributeTagProcessor {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
                         Map<String, Object> map1 = new HashMap<>();
-                        if (role.equals(RoleType.ROLE_DEVOPS.name())) {
+                        if (role.equals(RoleType.ROLE_ADMIN.name())) {
                             for (EnvType envType : EnvType.values()) {
                                 map1.put(envType.name(), envType.name());
                             }
-                        } else if (role.equals(RoleType.ROLE_DEVELOP.name())
-                                || role.equals(RoleType.ROLE_JAVA.name())
+                        } else if (role.equals(RoleType.ROLE_JAVA.name())
                                 || role.equals(RoleType.ROLE_DOTNET.name())
                                 || role.equals(RoleType.ROLE_NPM.name())) {
                             map1.put(EnvType.uat.name(), EnvType.uat.name());
@@ -91,7 +90,7 @@ public class SelectDictAttrProcessor extends AbstractAttributeTagProcessor {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
                         Map<String, Object> map1 = new HashMap<>();
-                        if (role.equals(RoleType.ROLE_DEVOPS.name())) {
+                        if (role.equals(RoleType.ROLE_ADMIN.name())) {
                             for (AppType appType : AppType.values()) {
                                 map1.put(appType.name(), appType.name());
                             }