修改组织机构删除

lidongdong

2022-10-09 220168e5abb8e8d1515653aaccd622197c321886

修改组织机构删除

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

@@ -84,15 +84,13 @@
     */
    @ApiOperation("删除机构")
    @DeleteMapping("/delete")
    @Authorization
//    @Authorization
    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));

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

@@ -62,5 +62,12 @@
    List<String> getIds(String id);


    /**
     * 根据id  查询是否有子部门
     * @param parentId
     * @param grade
     * @return
     */
    public List<OrganizationChartEntity> selectParentList(String parentId,String grade);

}

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -113,6 +113,11 @@
        return ids;
    }

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

    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
    {