From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
index 0826dc1..c09648f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
@@ -51,7 +51,7 @@
/**
* 获取部门管理管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:department:list')")
+ @PreAuthorize("@ss.hasPermi('system:department')")
@ApiOperation(value = "获取部门管理分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<DeptVO>> pageList(@RequestBody TDeptQuery query) {
@@ -61,10 +61,19 @@
/**
* 获取部门管理管理列表
*/
- @ApiOperation(value = "获取部门管理列表")
+ @ApiOperation(value = "获取部门管理列表-启用状态")
@PostMapping(value = "/list")
public R<List<TDept>> list() {
- return R.ok(deptService.list());
+ return R.ok(deptService.list(Wrappers.lambdaQuery(TDept.class)
+ .eq(TDept::getStatus, 1)));
+ }
+ /**
+ * 获取部门管理管理列表
+ */
+ @ApiOperation(value = "获取部门管理列表-所有状态")
+ @PostMapping(value = "/listAll")
+ public R<List<TDept>> listAll() {
+ return R.ok(deptService.list(Wrappers.lambdaQuery(TDept.class)));
}
/**
--
Gitblit v1.7.1