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 | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 ad9a031..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
@@ -6,7 +6,6 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TDeptUpAndDownDTO;
@@ -52,7 +51,7 @@
/**
* 获取部门管理管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @PreAuthorize("@ss.hasPermi('system:department:list')")
@ApiOperation(value = "获取部门管理分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<DeptVO>> pageList(@RequestBody TDeptQuery query) {
@@ -60,9 +59,27 @@
}
/**
+ * 获取部门管理管理列表
+ */
+ @ApiOperation(value = "获取部门管理列表-启用状态")
+ @PostMapping(value = "/list")
+ public R<List<TDept>> 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)));
+ }
+
+ /**
* 添加部门管理管理
*/
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ @PreAuthorize("@ss.hasPermi('system:department:add')")
@Log(title = "部门管理信息-新增部门管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加部门管理")
@PostMapping(value = "/add")
@@ -78,7 +95,7 @@
/**
* 修改部门管理
*/
- @PreAuthorize("@ss.hasPermi('system:dept:update')")
+ @PreAuthorize("@ss.hasPermi('system:department:edit')")
@Log(title = "部门管理信息-修改部门管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改部门管理")
@PostMapping(value = "/update")
@@ -94,7 +111,7 @@
/**
* 查看部门管理详情
*/
- @PreAuthorize("@ss.hasPermi('system:dept:detail')")
+ @PreAuthorize("@ss.hasPermi('system:department:edit')")
@ApiOperation(value = "查看部门管理详情")
@GetMapping(value = "/getDetailById")
public R<TDept> getDetailById(@RequestParam String id) {
@@ -104,7 +121,7 @@
/**
* 删除部门管理
*/
- @PreAuthorize("@ss.hasPermi('system:dept:delete')")
+ @PreAuthorize("@ss.hasPermi('system:department:delete')")
@Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除部门管理")
@DeleteMapping(value = "/deleteById")
@@ -118,7 +135,7 @@
/**
* 批量删除部门管理
*/
- @PreAuthorize("@ss.hasPermi('system:dept:delete')")
+ @PreAuthorize("@ss.hasPermi('system:department:delete')")
@Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除部门管理")
@DeleteMapping(value = "/deleteByIds")
@@ -132,7 +149,7 @@
/**
* 轮播图上下架
*/
- @PreAuthorize("@ss.hasPermi('system:dept:upAndDown')")
+ @PreAuthorize("@ss.hasPermi('system:department:open')")
@ApiOperation(value = "部门管理上下架",notes = "true:上架，false:下架")
@PostMapping(value = "/upAndDown")
public R upAndDown(@RequestBody TDeptUpAndDownDTO dto) {
--
Gitblit v1.7.1