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

lidongdong

2022-10-24 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2

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

@@ -6,7 +6,10 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +32,9 @@
    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 查询机构列表
     */
@@ -36,7 +42,19 @@
    @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)
    {
        return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
    }

    /**
@@ -75,7 +93,7 @@
    public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
    {
        entity.setUpdateTime(LocalDateTime.now());
        entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
        entity.setUpdateUserId(sysUser.getUserId());
        return toAjax(iOrganizationChartService.updateConfig(entity));
    }

@@ -93,6 +111,15 @@
        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }

        List<String> ids=new ArrayList<>();
        ids.add(Id);
        List<TransactionEvent> transactionEvents=iTransactionEventService.selectConfigList(null,null,ids);

        if(transactionEvents!=null && transactionEvents.size()>0)
        {
            return ResultData.error("该机构下已绑定办事指南！请解绑办事指南");
        }
        return toAjax(iOrganizationChartService.deleteConfigById(Id));
    }
@@ -124,11 +151,14 @@
    @Authorization
    public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                            @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                            @RequestParam(value = "organizationName",required = false)String organizationName){
                                            @RequestParam(value = "organizationName",required = false)String organizationName,
                                   @CurrentUser SysUser sysUser){
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
                            iOrganizationChartService.countList(organizationName,ids));
    }


@@ -142,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));
@@ -152,7 +192,12 @@
        {
            return null;
        }
        ids.add(iOrganizationChartService.selectConfigById(departmentId));

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

        return getDataTable(ids);
    }

@@ -162,7 +207,6 @@
        List<OrganizationChartEntity> ids=new ArrayList<>();
        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet);
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreet(sysStreet.getChild()));
@@ -174,5 +218,4 @@
        }
        return ids;
    }

}