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

lidongdong

2022-10-12 119a07bcc03db7c7dbd09b377cc18f3db6cbdd37

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -147,7 +147,10 @@
                    departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
            }
        }
        return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
        if (classifyId==null)
            return baseMapper.selectListByDepartmentId(departmentIds,null,null);
        else
             return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
    }

    @Override
@@ -224,6 +227,11 @@
        }
    }

    @Override
    public List<SysUser> queryList(Integer userType) {
        return baseMapper.queryList(userType);
    }

    public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
        for (OrganizationChartEntity organizationChart:organizationChartEntities) {
            departmentIds.add(organizationChart.getId().toString());