KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】去除用户列表的接口权限，规避查人、查角色接口无法获取数据的问题

Browse Source
This commit is contained in:
zer0Black
2022-12-22 13:50:27 +08:00
parent 85ac6d8293
commit 56ce3d9a1d
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+8 -8
View File
@@ -90,7 +90,7 @@ public class SysRoleController {
* @param req * @param req
* @return * @return
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/page", method = RequestMethod.GET) @RequestMapping(value = "/page", method = RequestMethod.GET)
public Result<IPage<SysRole>> queryPageList(SysRole role, public Result<IPage<SysRole>> queryPageList(SysRole role,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -182,7 +182,7 @@ public class SysRoleController {
* @param id * @param id
* @return * @return
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryById", method = RequestMethod.GET) @RequestMapping(value = "/queryById", method = RequestMethod.GET)
public Result<SysRole> queryById(@RequestParam(name="id",required=true) String id) { public Result<SysRole> queryById(@RequestParam(name="id",required=true) String id) {
SysRole sysRole = sysRoleService.getById(id); SysRole sysRole = sysRoleService.getById(id);
@@ -192,7 +192,7 @@ public class SysRoleController {
return Result.OK(sysRole); return Result.OK(sysRole);
} }
} }
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryall", method = RequestMethod.GET) @RequestMapping(value = "/queryall", method = RequestMethod.GET)
public Result<List<SysRole>> queryall() { public Result<List<SysRole>> queryall() {
List<SysRole> list = sysRoleService.list(); List<SysRole> list = sysRoleService.list();
@@ -206,7 +206,7 @@ public class SysRoleController {
/** /**
* 校验角色编码唯一 * 校验角色编码唯一
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET)
public Result<Boolean> checkUsername(String id,String roleCode) { public Result<Boolean> checkUsername(String id,String roleCode) {
Result<Boolean> result = new Result<>(); Result<Boolean> result = new Result<>();
@@ -299,7 +299,7 @@ public class SysRoleController {
/** /**
* 查询数据规则数据 * 查询数据规则数据
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@GetMapping(value = "/datarule/{permissionId}/{roleId}") @GetMapping(value = "/datarule/{permissionId}/{roleId}")
public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) {
List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId);
@@ -329,7 +329,7 @@ public class SysRoleController {
/** /**
* 保存数据规则至角色菜单关联表 * 保存数据规则至角色菜单关联表
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@PostMapping(value = "/datarule") @PostMapping(value = "/datarule")
public Result<?> saveDatarule(@RequestBody JSONObject jsonObject) { public Result<?> saveDatarule(@RequestBody JSONObject jsonObject) {
try { try {
@@ -360,7 +360,7 @@ public class SysRoleController {
* @param request * @param request
* @return * @return
*/ */
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
public Result<Map<String,Object>> queryTreeList(HttpServletRequest request) { public Result<Map<String,Object>> queryTreeList(HttpServletRequest request) {
Result<Map<String,Object>> result = new Result<>(); Result<Map<String,Object>> result = new Result<>();
@@ -386,7 +386,7 @@ public class SysRoleController {
} }
return result; return result;
} }
@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) { private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
for (SysPermission permission : metaList) { for (SysPermission permission : metaList) {
String tempPid = permission.getParentId(); String tempPid = permission.getParentId();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+18 -18
View File
@@ -95,7 +95,7 @@ public class SysUserController {
* @param req * @param req
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@PermissionData(pageComponent = "system/UserList") @PermissionData(pageComponent = "system/UserList")
@RequestMapping(value = "/page", method = RequestMethod.GET) @RequestMapping(value = "/page", method = RequestMethod.GET)
public Result<IPage<SysUser>> queryPageList(SysUser user, public Result<IPage<SysUser>> queryPageList(SysUser user,
@@ -238,7 +238,7 @@ public class SysUserController {
} }
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) { public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try { try {
@@ -258,7 +258,7 @@ public class SysUserController {
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/queryById", method = RequestMethod.GET) @RequestMapping(value = "/queryById", method = RequestMethod.GET)
public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) { public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
SysUser sysUser = sysUserService.getById(id); SysUser sysUser = sysUserService.getById(id);
@@ -269,7 +269,7 @@ public class SysUserController {
} }
} }
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
@@ -292,7 +292,7 @@ public class SysUserController {
* @param sysUser * @param sysUser
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET)
public Result<Boolean> checkOnlyUser(SysUser sysUser) { public Result<Boolean> checkOnlyUser(SysUser sysUser) {
Result<Boolean> result = new Result<>(); Result<Boolean> result = new Result<>();
@@ -336,7 +336,7 @@ public class SysUserController {
* @param userId * @param userId
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/userDepartList", method = RequestMethod.GET) @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) { public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
Result<List<DepartIdModel>> result = new Result<>(); Result<List<DepartIdModel>> result = new Result<>();
@@ -365,7 +365,7 @@ public class SysUserController {
* *
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/generateUserId", method = RequestMethod.GET) @RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
public Result<String> generateUserId() { public Result<String> generateUserId() {
Result<String> result = new Result<>(); Result<String> result = new Result<>();
@@ -382,7 +382,7 @@ public class SysUserController {
* @param id * @param id
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) { public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) {
Result<List<SysUser>> result = new Result<>(); Result<List<SysUser>> result = new Result<>();
@@ -548,7 +548,7 @@ public class SysUserController {
* @param userIds * @param userIds
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/queryByIds", method = RequestMethod.GET) @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) { public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
Result<Collection<SysUser>> result = new Result<>(); Result<Collection<SysUser>> result = new Result<>();
@@ -592,7 +592,7 @@ public class SysUserController {
} }
return sysUserService.resetPassword(username,oldpassword,password,confirmpassword); return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
} }
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/userRoleList", method = RequestMethod.GET) @RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -682,7 +682,7 @@ public class SysUserController {
* 部门用户列表 * 部门用户列表
*/ */
@RequestMapping(value = "/departUserList", method = RequestMethod.GET) @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>(); Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
@@ -729,7 +729,7 @@ public class SysUserController {
* 若某个用户包含多个部门，则会显示多条记录，可自行处理成单条记录 * 若某个用户包含多个部门，则会显示多条记录，可自行处理成单条记录
*/ */
@GetMapping("/queryByOrgCode") @GetMapping("/queryByOrgCode")
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
public Result<?> queryByDepartId( public Result<?> queryByDepartId(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -815,7 +815,7 @@ public class SysUserController {
* 查询当前用户的所有部门/当前部门编码 * 查询当前用户的所有部门/当前部门编码
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
public Result<Map<String,Object>> getCurrentUserDeparts() { public Result<Map<String,Object>> getCurrentUserDeparts() {
try { try {
@@ -989,7 +989,7 @@ public class SysUserController {
* *
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/getUserSectionInfoByToken") @GetMapping("/getUserSectionInfoByToken")
public Result<?> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) { public Result<?> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
try { try {
@@ -1027,7 +1027,7 @@ public class SysUserController {
* @param pageSize * @param pageSize
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/appUserList") @GetMapping("/appUserList")
public Result<?> appUserList(@RequestParam(name = "keyword", required = false) String keyword, public Result<?> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
@RequestParam(name = "username", required = false) String username, @RequestParam(name = "username", required = false) String username,
@@ -1064,7 +1064,7 @@ public class SysUserController {
* *
* @return logicDeletedUserList * @return logicDeletedUserList
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/recycleBin") @GetMapping("/recycleBin")
public Result getRecycleBin() { public Result getRecycleBin() {
List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted(); List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted();
@@ -1085,7 +1085,7 @@ public class SysUserController {
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
String userIds = jsonObject.getString("userIds"); String userIds = jsonObject.getString("userIds");
@@ -1198,7 +1198,7 @@ public class SysUserController {
* *
* @return Result * @return Result
*/ */
@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/queryChildrenByUsername") @GetMapping("/queryChildrenByUsername")
public Result queryChildrenByUsername(@RequestParam("userId") String userId) { public Result queryChildrenByUsername(@RequestParam("userId") String userId) {
//获取用户信息 //获取用户信息