修改选择项部门权限显示 bug

lidongdong

2022-10-24 8c7e4f2ca8f2dcd0f66604e5e05bc15f556aa887

修改选择项部门权限显示  bug

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -42,7 +42,22 @@
    @GetMapping("/getList")
    public TableDataInfo selectConfigList()
    {
        return getDataTable(iOrganizationChartService.selectConfigList("",""));
        return getDataTable(iOrganizationChartService.selectConfigList("","",null));
    }


    /**
     * 查询机构列表(权限)
     */
    @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
    @GetMapping("/selectJurisdiction")
    @Authorization
    public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
    {
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<OrganizationChartEntity> organizations=iOrganizationChartService.selectConfigList("","",ids);

        return getDataTable(organizations);
    }

    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java

@@ -14,7 +14,8 @@
     * 查询机构列表
     */
    public List<OrganizationChartEntity> selectConfigList(@Param("parentId") String parentId,
                                                          @Param("grade") String grade);
                                                          @Param("grade") String grade,
                                                          @Param("ids") List<String> ids);

    /**
     * 新增机构

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -10,7 +10,7 @@
    /**
     * 查询机构列表
     */
    public List<OrganizationChartEntity> selectConfigList(String parentId,String grade);
    public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids);

    /**
     * 新增机构

 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()));
@@ -93,7 +93,7 @@

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

    /**
@@ -106,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));

 flower_city/src/main/resources/mapper/OrganizationChartMapper.xml

@@ -93,6 +93,12 @@
            <if test="grade != null and grade != ''">
                AND grade=#{grade}
            </if>
            <if test="ids != null">
                and id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>