fengjin
2022-10-10 3bb39d123ef72b627386301af48a349defda69bd
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -88,11 +88,9 @@
    public ResultData deleteConfigById(@RequestParam(value = "Id",required = false)  String Id)
    {
        Assert.notNull(Id, "Id 不能为空");
        OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
        List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");
        List<OrganizationChartEntity> list=iOrganizationChartService.selectConfigList(entity.getId()+"","");
        if(list.size()>0)
        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门!请先删除子部门");
        }
@@ -144,7 +142,7 @@
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectConfigList(departmentId,"");
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
        if(lists.size()<1)
        {
            lists.add(iOrganizationChartService.selectConfigById(departmentId));