From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..772f34c 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
@@ -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