lidongdong
2022-10-08 53e9765219ea5e885393dc9c02ee0c46cc42ae08
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -1,11 +1,9 @@
package com.dg.core.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
@@ -90,6 +88,11 @@
    public ResultData deleteConfigById(@RequestParam(value = "Id",required = false)  String Id)
    {
        Assert.notNull(Id, "Id 不能为空");
        OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
        if(!StringUtils.isEmpty(entity.getParentId()))
        {
            return ResultData.error("该机构下存在其他部门!请先删除子部门");
        }
        return toAjax(iOrganizationChartService.deleteConfigById(Id));
    }
@@ -133,7 +136,7 @@
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
    @GetMapping("/getdepartment")
    public TableDataInfo getIds(@RequestParam(value = "department",required = false) String departmentId)
    {
@@ -153,7 +156,6 @@
        return getDataTable(ids);
    }
    //递归取id
    private List<OrganizationChartEntity> disposestreetId(List<OrganizationChartEntity> lists)
    {
@@ -172,8 +174,5 @@
        }
        return ids;
    }
}