权限逻辑修改

kmall-common/src/main/java/com/kmall/common/controller/SysRoleController.java

@@ -1,14 +1,12 @@
 package com.kmall.common.controller;
 
 import com.kmall.common.annotation.SysLog;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.entity.SysRoleEntity;
 import com.kmall.common.service.SysRoleDeptService;
 import com.kmall.common.service.SysRoleMenuService;
 import com.kmall.common.service.SysRoleService;
-import com.kmall.common.utils.Constant;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
+import com.kmall.common.utils.*;
 import com.kmall.common.validator.ValidatorUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,8 +62,11 @@ public class SysRoleController extends AbstractController {
     public R select() {
         Map<String, Object> map = new HashMap<>();
 
-        //如果不是超级管理员，则只查询自己所拥有的角色列表
-        if (getUserId() != Constant.SUPER_ADMIN) {
+//        //如果不是超级管理员，则只查询自己所拥有的角色列表
+//        if (getUserId() != Constant.SUPER_ADMIN) {
+//            map.put("createUserId", getUserId());
+//        }
+        if(!ShiroUtils.getUserEntity().getRoleType().equalsIgnoreCase(Dict.roleType.item_1.getItem())){
             map.put("createUserId", getUserId());
         }
         List<SysRoleEntity> list = sysRoleService.queryList(map);

kmall-common/src/main/java/com/kmall/common/controller/SysUserController.java

@@ -1,6 +1,7 @@
 package com.kmall.common.controller;
 
 import com.kmall.common.annotation.SysLog;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.service.SysUserRoleService;
 import com.kmall.common.service.SysUserService;
@@ -39,8 +40,11 @@ public class SysUserController extends AbstractController {
     @RequestMapping("/list")
     @RequiresPermissions("sys:user:list")
     public R list(@RequestParam Map<String, Object> params) {
-        //只有超级管理员，才能查看所有管理员列表
-        if (getUserId() != Constant.SUPER_ADMIN) {
+//        //只有超级管理员，才能查看所有管理员列表
+//        if (getUserId() != Constant.SUPER_ADMIN) {
+//            params.put("createUserId", getUserId());
+//        }
+        if(!ShiroUtils.getUserEntity().getRoleType().equalsIgnoreCase(Dict.roleType.item_1.getItem())){
             params.put("createUserId", getUserId());
         }