Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 7221f94146162703991df36995b9e3ca50402ff1

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -100,6 +100,7 @@
                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                                .stream().map(TProjectDept::getId).collect(Collectors.toList());
                        listIds.addAll(collect);
                    listIds.add(tProjectDept.getId());
                }
            }
            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()