Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 946dc71d5679974538986e38f19c48bb2d1bdcae

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

@@ -272,11 +272,18 @@
        List<String> strings = new ArrayList<>();
        strings.add(id);
        TProjectDept projectDept = projectDeptService.getById(id);
        if (projectDept.getParentId().equals("0")){
            List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId())
                    .list().stream().map(TProjectDept::getId).collect(Collectors.toList());
        if (projectDept!=null){
            if (projectDept.getParentId().equals("0")){
                List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId())
                        .list().stream().map(TProjectDept::getId).collect(Collectors.toList());
                strings.addAll(collect);
            }
        }else{
            List<String> collect = deptService.lambdaQuery().eq(TDept::getId, id)
                    .list().stream().map(TDept::getId).collect(Collectors.toList());
            strings.addAll(collect);
        }

        List<SysUser> res = sysUserService.selectUserByDeptId(strings);
        return R.ok(res);
    }