diff --git a/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java b/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java index 13b7322..0dc35cb 100644 --- a/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java +++ b/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java @@ -1,11 +1,16 @@ package com.xdap.self_development.pojo.view; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.ArrayList; + @Data +@AllArgsConstructor +@NoArgsConstructor public class MenuParamView { private String id; // private String menuPath; @@ -14,4 +19,5 @@ public class MenuParamView { // private String parameterName; // private String parameterId; private String parameterPer; + private Integer isAdmin; } diff --git a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java index 98157fc..97cdcd6 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java @@ -174,6 +174,14 @@ public class ModelRoleServiceImpl implements ModelRoleService { if (ObjectUtils.isEmpty(roleID)) { throw new RuntimeException("角色为空"); } + ModelRolesPojo modelRolesPojos = businessDatabase.getBusinessDatabase() + .eq("is_enabled", 1) + .eq("id", roleID) + .doQueryFirst(ModelRolesPojo.class); + if (ObjectUtils.isNotEmpty(modelRolesPojos) && (modelRolesPojos.getRoleCode().contains("ADMIN") + || modelRolesPojos.getRoleCode().contains("Admin") || modelRolesPojos.getRoleCode().contains("admin"))) { + return Arrays.asList(new MenuParamView(roleID, "", "", "",1)); + } ArrayList menuParamViews = new ArrayList<>(); List role = businessDatabase.getBusinessDatabase() .eq("role_id", roleID) @@ -292,7 +300,7 @@ public class ModelRoleServiceImpl implements ModelRoleService { if (ObjectUtils.isEmpty(xdapDepartments)) { stringsDept.add("未知部门:" + depId); } else { - stringsDept.add(xdapDepartments.getName()+"-ID:"+depId); + stringsDept.add(xdapDepartments.getName() + "-ID:" + depId); } } map.put("部门", stringsDept);