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

lidongdong

2022-10-24 2d26c2b864cad8b988adc5258e3e06eaff4c35a4

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

@@ -17,13 +17,13 @@
{

    @Override
    public List<OrganizationChartEntity> selectConfigList(String parentId,String grade)
    public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids)
    {
        List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1");
        List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1",ids);

        for (OrganizationChartEntity entity:ocList)
        {
            entity.setChild(baseMapper.selectConfigList(entity.getId()+"",""));
            entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",ids));

            if (entity.getChild()!=null)
            {
@@ -57,9 +57,9 @@


    public List<OrganizationChartEntity> selectConfigList(String parentsId) {
        List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"");
        List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"",null);
        for (OrganizationChartEntity sysStreet:list) {
            sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),""));
            sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),"",null));
            if (sysStreet.getChild()!=null)
            {
                sysStreet.setChild(this.selectConfigList(sysStreet.getId().toString()));
@@ -80,19 +80,20 @@
    }

    @Override
    public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) {
        return baseMapper.queryList(page,state,organizationName);
    public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
                                                   String organizationName,List<String> ids) {
        return baseMapper.queryList(page,state,organizationName,ids);
    }

    @Override
    public int countList(String organizationName) {
        return baseMapper.countList(organizationName);
    public int countList(String organizationName,List<String> ids) {
        return baseMapper.countList(organizationName,ids);
    }


    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
        return baseMapper.selectConfigList(parentId,grade,null);
    }

    /**
@@ -105,7 +106,7 @@
    public List<String> getIds(String id)
    {
        List<String> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"");
        List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"",null);
        if(lists.size()<1)
        {
            lists.add(baseMapper.selectConfigById(id));