yumeng il y a 5 ans
Parent
commit
6694f5c4d8

+ 16 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -88,22 +88,18 @@ public class ProjectController {
     public Map<String, Object> responsibleList(String userId) {
         Map<String, Object> map = new HashMap<>();
 
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (Check.isNull(sysUser)) {
-            map.put("success", false);
-            map.put("code", -1);
-        }
-
-        String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
+        String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         if (!"admin".equals(roleCode)) {
-            queryWrapper.eq("user_id", sysUser.getId());
+            queryWrapper.eq("responsible_id", userId);
             queryWrapper.orderByDesc("create_time");
         }
         List<Project> projects = projectMapper.selectList(queryWrapper);
         map.put("success", true);
         map.put("code", 0);
         map.put("result", projects);
+
+
         return map;
     }
 
@@ -127,6 +123,18 @@ public class ProjectController {
         Result<IPage<Project>> result = new Result<IPage<Project>>();
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         Page<Project> page = new Page<Project>(pageNo, pageSize);
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (Check.isNull(sysUser)) {
+            result.setSuccess(false);
+            return result;
+        }
+
+        String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
+        if (!"admin".equals(roleCode)) {
+            queryWrapper.eq("user_id", sysUser.getId());
+            queryWrapper.orderByDesc("create_time");
+        }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);