blame | history | patch | commit | commitdiff | show whitespace
xin
2025-06-03 95dc030ad8e77303207a1a42a3afd9a7a6612d75 
 oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java


@@ -3,6 +3,7 @@


import cn.hutool.core.collection.CollectionUtil;


import com.oying.modules.system.domain.Dept;


import com.oying.modules.system.domain.dto.DeptQueryCriteria;


import com.oying.utils.R;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.RequiredArgsConstructor;


@@ -16,6 +17,7 @@


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import javax.servlet.http.HttpServletResponse;


import java.util.*;


import java.util.stream.Collectors;


@@ -43,9 +45,9 @@


    @ApiOperation("查询机构")


    @GetMapping


    @PreAuthorize("@el.check('user:list','dept:list')")


    public ResponseEntity<PageResult<Dept>> queryDept(DeptQueryCriteria criteria) throws Exception {


    public ResponseEntity<Object> queryDept(DeptQueryCriteria criteria) throws Exception {


        List<Dept> depts = deptService.queryAll(criteria, true);


        return new ResponseEntity<>(PageUtil.toPage(depts),HttpStatus.OK);


        return new ResponseEntity<>(R.success(PageUtil.toPage(depts)), HttpStatus.OK);


    }




    @ApiOperation("查询机构:根据ID获取同级与上级数据")


@@ -67,7 +69,7 @@


            }


            deptSet.addAll(depts);


        }


        return new ResponseEntity<>(deptService.buildTree(new ArrayList<>(deptSet)),HttpStatus.OK);


        return new ResponseEntity<>(R.success(deptService.buildTree(new ArrayList<>(deptSet))), HttpStatus.OK);


    }




    @Log("新增机构")


@@ -79,7 +81,7 @@


            throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");


        }


        deptService.create(resources);


        return new ResponseEntity<>(HttpStatus.CREATED);


        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);


    }




    @Log("修改机构")


@@ -88,7 +90,7 @@


    @PreAuthorize("@el.check('dept:edit')")


    public ResponseEntity<Object> updateDept(@Validated(Dept.Update.class) @RequestBody Dept resources){


        deptService.update(resources);


        return new ResponseEntity<>(HttpStatus.NO_CONTENT);


        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);


    }




    @Log("删除机构")


@@ -107,6 +109,6 @@


        // 验证是否被角色或用户关联


        deptService.verification(depts);


        deptService.delete(depts);


        return new ResponseEntity<>(HttpStatus.OK);


        return new ResponseEntity<>(R.success(),HttpStatus.OK);


    }


}