yumeng 3 rokov pred
rodič
commit
8f9ca75ccc

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/constant/CtopRoleCodeConstant.java

@@ -1,5 +1,5 @@
 package cn.com.ctop.common.module.constant;
 
-public class  CtopRoleCodeConstant {
+public class CtopRoleCodeConstant {
     public static final String COMMON_ROLE_CODE_ADMIN = "admin";
 }

+ 6 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

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