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

lidongdong

2022-10-24 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2

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

@@ -54,10 +54,7 @@
    @Authorization
    public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
    {
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<OrganizationChartEntity> organizations=iOrganizationChartService.selectConfigList("","",ids);

        return getDataTable(organizations);
        return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
    }

    /**
@@ -175,7 +172,17 @@
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
        List<OrganizationChartEntity> lists=null;
        if(StringUtils.isEmpty(departmentId))
        {
            lists= iOrganizationChartService.selectParentList(null,"1");

        }
        else
        {
            lists= iOrganizationChartService.selectParentList(departmentId,null);
        }

        if(lists.size()<1)
        {
            lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -185,7 +192,12 @@
        {
            return null;
        }
        ids.add(iOrganizationChartService.selectConfigById(departmentId));

        if(!StringUtils.isEmpty(departmentId))
        {
            ids.add(iOrganizationChartService.selectConfigById(departmentId));
        }

        return getDataTable(ids);
    }