我的任务查询逻辑修改；fix查询task_status查询

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/itdmFirstPageController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,7 +49,7 @@ public class itdmFirstPageController {
         System.out.println("realName:"+ realName+ "  username:"+ username);
 
         ItdmTask itdmTask = new ItdmTask();
-
+        List<String> roles = new ArrayList<>();
         if(!username.equals("admin")){
             itdmTask.setTaskUser(realName);
 
@@ -57,19 +58,22 @@ public class itdmFirstPageController {
             Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
             List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
             if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
-                List<String> roles = userRoleList.stream().map(i->{
+                roles = userRoleList.stream().map(i->{
                     return roleService.getById(i.getRoleId()).getRoleName();
                 }).collect(Collectors.toList());
 
-                String role = roles.get(0); // 登录人角色，只有一个(可以有多个，但本系统根据客户需求由前端限制只有一个)
-                itdmTask.setTaskRole(role);
+//                String role = roles.get(0); // 登录人角色，只有一个(可以有多个，但本系统根据客户需求由前端限制只有一个)
+//                itdmTask.setTaskRole(role);
 
-                if(role.equals("经理") || role.equals("计划员")) itdmTask.setTaskUser(null);
+//                if(role.equals("经理") || role.equals("计划员")) itdmTask.setTaskUser(null);
             }
 
         }
 
-        Wrapper<ItdmTask> taskWrapper = new QueryWrapper<>(itdmTask);
+        QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>(itdmTask);
+
+        if(!username.equals("admin")) taskWrapper.in("task_role", roles);
+
         Long totalNum = taskService.count(taskWrapper);
 
         itdmTask.setTaskStatus(0);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/xml/ItdmTaskMapper.xml

@@ -9,7 +9,7 @@
         left join itdm_weituo_info w on t.weituo_id = w.id
         <where>
             <if test="taskUser != null and taskUser != ''"> task_user = #{taskUser}</if>
-            <if test="taskStatus != null and taskStatus != ''"> and task_status = #{taskStatus}</if>
+            <if test="taskStatus != null "> and task_status = #{taskStatus}</if>
             <if test="taskRoleList != null and taskRoleList.size() > 0">
                 and task_role in
                 <foreach collection="taskRoleList" item="role" separator="," open="(" close=")">