From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
index 9b94d78..64f6b50 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
@@ -29,6 +29,8 @@
@Autowired
private ISysDeptService deptService;
+
+
/**
* 获取部门列表
*/
@@ -67,7 +69,7 @@
* 新增部门
*/
@RequiresPermissions("system:dept:add")
- @Log(title = "部门管理", businessType = BusinessType.INSERT)
+ @Log(title = "部门管理", businessType = BusinessType.INSERT,operContent = "新增部门")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
@@ -75,6 +77,8 @@
{
return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
+ dept.setParentId(100L);
+ dept.setOrderNum(1);
dept.setCreateBy(SecurityUtils.getUsername());
return toAjax(deptService.insertDept(dept));
}
@@ -83,7 +87,7 @@
* 修改部门
*/
@RequiresPermissions("system:dept:edit")
- @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+ @Log(title = "部门管理", businessType = BusinessType.UPDATE,operContent = "修改部门")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
@@ -109,7 +113,7 @@
* 删除部门
*/
@RequiresPermissions("system:dept:remove")
- @Log(title = "部门管理", businessType = BusinessType.DELETE)
+ @Log(title = "部门管理", businessType = BusinessType.DELETE,operContent = "删除部门")
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
{
--
Gitblit v1.7.1