|
@@ -22,10 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.apache.shiro.SecurityUtils;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
-import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
@@ -486,11 +484,14 @@ public class UserAllocationController {
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
Result<IPage<UserAllocation>> result = new Result<>();
|
|
Result<IPage<UserAllocation>> result = new Result<>();
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
|
|
+ String userId = userAllocation.getUserId();
|
|
|
|
+ userAllocation.setUserId(null);
|
|
|
|
+
|
|
|
|
+
|
|
QueryWrapper<UserAllocation> queryWrapper = QueryGenerator.initQueryWrapper(userAllocation, req.getParameterMap());
|
|
QueryWrapper<UserAllocation> queryWrapper = QueryGenerator.initQueryWrapper(userAllocation, req.getParameterMap());
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(user.getId());
|
|
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
if (!CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
|
|
if (!CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
|
|
- queryWrapper.eq("user_id", user.getId());
|
|
|
|
|
|
+ queryWrapper.eq("user_id", userId);
|
|
queryWrapper.orderByDesc("id");
|
|
queryWrapper.orderByDesc("id");
|
|
}
|
|
}
|
|
Page<UserAllocation> page = new Page<>(pageNo, pageSize);
|
|
Page<UserAllocation> page = new Page<>(pageNo, pageSize);
|