Merge remote-tracking branch 'origin/dev_4newlayout' into dev_4newlayout

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@@ -89,7 +89,8 @@ public class TaskController extends JeecgController<Task, ITaskService> {
     @ApiOperation(value = "任务管理-分页列表查询", notes = "任务管理-分页列表查询")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(Task task,
-                                   @RequestParam(name = "userName",defaultValue = "") String userName,
+                                   @RequestParam(name = "type",required = false) List<String> type,
+                                   @RequestParam(name = "userName", defaultValue = "") String userName,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
@@ -100,19 +101,27 @@ public class TaskController extends JeecgController<Task, ITaskService> {
         if (!StringUtils.equals(ADMIN, user.getUsername())) {
             queryWrapper.like("manager_users", user.getId());
         }
+        if (type != null && type.size() > 0)
+            queryWrapper.and(qw -> {
+                for (int i = 0; i < type.size(); i++) {
+                    qw.eq("type_id", type.get(i));
+                    if (i != type.size() - 1)
+                        qw.or();
+                }
+            });
+
         List<SysUser> sysUsers = taskService.UserIdByUserName(userName);
-        if(sysUsers!=null&& sysUsers.size() > 0)
-            for (int i = 0; i < sysUsers.size(); i++) {
-                queryWrapper.like("manager_users", sysUsers.get(i).getId());
-                if (i != sysUsers.size() - 1)
-                    queryWrapper.or();
-            }
-        if (task != null && StringUtils.isNotBlank(task.getTypeId())) {
-            queryWrapper.eq("type_id", task.getTypeId());
-        }
+        if (sysUsers != null && sysUsers.size() > 0)
+            queryWrapper.and(qw -> {
+                for (int i = 0; i < sysUsers.size(); i++) {
+                    qw.like("manager_users", sysUsers.get(i).getId());
+                    if (i != sysUsers.size() - 1)
+                        qw.or();
+                }
+            });
         if (task != null && StringUtils.isNotBlank(task.getTaskName())) {
             String tas = task.getTaskName();
-            if(tas.startsWith("*")&&tas.endsWith("*"))
+            if (tas.startsWith("*") && tas.endsWith("*"))
                 tas = tas.substring(1, tas.length() - 1);
             queryWrapper.like("task_name", tas);
         }