test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(系统设置): 项目列表权限问题 

--bug=1033572 --user=宋昌昌 [系统设置]github#27903创建新用户并绑定对应项目，用新用户登录后，在项目列表中可以跳转到绑定的项目，但是点击成员时却显示无该项目权限 https://www.tapd.cn/55049933/s/1446895
This commit is contained in:
song-cc-rock 2023-12-21 16:41:16 +08:00 committed by 刘瑞斌
parent 1cb5b5b2f3
commit 49aa2a45e5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system-setting/backend/src/main/java/io/metersphere/controller/UserController.java
View File

@ -16,20 +16,23 @@ import io.metersphere.excel.domain.ExcelResponse;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.log.annotation.MsAuditLog; import io.metersphere.log.annotation.MsAuditLog;
import io.metersphere.log.annotation.MsRequestLog; import io.metersphere.log.annotation.MsRequestLog;
import io.metersphere.request.member.*; import io.metersphere.request.member.AddMemberRequest;
import io.metersphere.request.member.EditPassWordRequest;
import io.metersphere.request.member.QueryMemberRequest;
import io.metersphere.request.member.UserRequest;
import io.metersphere.request.resourcepool.UserBatchProcessRequest; import io.metersphere.request.resourcepool.UserBatchProcessRequest;
import io.metersphere.service.BaseCheckPermissionService; import io.metersphere.service.BaseCheckPermissionService;
import io.metersphere.service.BaseUserService; import io.metersphere.service.BaseUserService;
import io.metersphere.service.UserService; import io.metersphere.service.UserService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@RequestMapping("user") @RequestMapping("user")
@ -93,7 +96,7 @@ public class UserController {
} }
@PostMapping("/special/ws/member/list/all") @PostMapping("/special/ws/member/list/all")
@RequiresPermissions(PermissionConstants.SYSTEM_WORKSPACE_READ) @RequiresPermissions(value = {PermissionConstants.SYSTEM_WORKSPACE_READ, PermissionConstants.WORKSPACE_USER_READ}, logical = Logical.OR)
public List<User> getMemberListByAdmin(@RequestBody QueryMemberRequest request) { public List<User> getMemberListByAdmin(@RequestBody QueryMemberRequest request) {
return baseUserService.getMemberList(request); return baseUserService.getMemberList(request);
} }