管理员角色

inventory-dao/src/main/java/com/rzyc/enums/ManageState.java

@@ -0,0 +1,27 @@
+package com.rzyc.enums;
+
+/**
+ * @author dong
+ * @date 2022-12-29 13:54
+ * @Version V1.0
+ * 是否为管理员 1.管理员 2.政府用户
+ */
+public enum ManageState {
+
+    YES(1),
+    NOT(2);
+
+    private Integer state;
+
+    ManageState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

inventory-dao/src/main/java/com/rzyc/mapper/SysRoleMapper.java

@@ -40,6 +40,9 @@ public interface SysRoleMapper {
     /*角色分页*/
     List<SysRole> rolePage(@Param("condition") String condition);
 
+    /*管理员角色*/
+    SysRole adminRole(@Param("manageState") Integer manageState);
+
     /*修改角色*/
     Integer changeRole(@Param("record") SysRole record);
 }

inventory-dao/src/main/resources/mapper/SysRoleMapper.xml

@@ -283,6 +283,15 @@
     SELECT * FROM SysRole sr WHERE sr.`RoleName` LIKE #{condition}
   </select>
 
+
+  <!--管理员角色-->
+  <select id="adminRole" resultMap="BaseResultMap">
+    SELECT * FROM SysRole sr
+    WHERE sr.`manage_state` = #{manageState}
+    order by sr.ModifiedOn DESC
+    limit 1
+  </select>
+
   <!--修改角色-->
   <update id="changeRole" >
     update SysRole

inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java

@@ -190,15 +190,26 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
      */
     @LoginAuth
     @ApiOperation(value = "用户功能项", notes = "用户功能项")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "manageState",value = "是否为管理员 1.管理员 2.普通用户 不传默认普通用户")
+    })
     @PostMapping(value = "/userResource/{userId}")
     @ResponseBody
-    public MultiResult<SysResource> userResource(@Valid @PathVariable String userId)throws Exception{
+    public MultiResult<SysResource> userResource(@Valid @PathVariable String userId,
+                                                 Integer manageState)throws Exception{
         MultiResult<SysResource> result = new MultiResult<>();
         System.out.println("userId -> "+userId);
         SysUser sysUser = sysUserMapper.findById(userId);
         if(null != sysUser){
             System.out.println(sysUser.getUserroles());
-            List<SysResource> resources = sysResourceMapper.findByRoleId(sysUser.getUserroles());
+            String roleId = sysUser.getUserroles();
+            if(ManageState.YES.getState().equals(manageState)){
+                SysRole sysRole = sysRoleMapper.adminRole(ManageState.YES.getState());
+                if(null != sysRole){
+                    roleId = sysRole.getSysroleid();
+                }
+            }
+            List<SysResource> resources = resources = sysResourceMapper.findByRoleId(roleId);
             if(resources.size() > 0){
                 //获取树形结构
                 JSONArray resourcesTree = handleResouceTree(resources);