From 0febd1ea7218cf2ae28cad07912bf6ba7b881d2c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:00:39 +0800
Subject: [PATCH] Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao
---
src/main/java/com/ruoyi/project/system/controller/SysDeptController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index dfe47f4..a33563d 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.system.controller;
import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -76,11 +78,12 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+ if (!deptService.checkDeptNameUnique(dept))
{
return error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
dept.setCreateBy(getUsername());
+ dept.setTenantId(SecurityUtils.getLoginUser().getTenantId());
return toAjax(deptService.insertDept(dept));
}
@@ -94,7 +97,7 @@
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+ if (!deptService.checkDeptNameUnique(dept))
{
return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
--
Gitblit v1.9.3