From b8126479634bc700f8a3850f39d12375b8d7795f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 一月 2026 17:41:09 +0800
Subject: [PATCH] 【丽水】角色管理修改处理
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 8 +++++++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 8 ++++----
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index f2b254a..ddc1d2d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -39,7 +39,7 @@
*/
public SysDept selectDeptById(Long deptId);
- public SysDept selectDeptByCode(String deptCode);
+ public SysDept selectDeptByCode(@Param("orgid") String orgid, @Param("campusid") String campusid,@Param("deptCode") String deptCode);
/**
* 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index f584437..c40bcbd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -564,7 +564,7 @@
// }
if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
for (String deptCode : user.getDeptCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), user.getCampusid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -590,7 +590,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), user.getCampusid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -673,7 +673,7 @@
// }
if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
for (String deptCode : user.getDeptCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), user.getCampusid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -699,7 +699,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), user.getCampusid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index ed674cf..4732f10 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -139,7 +139,13 @@
d.status
from sys_dept d
where del_flag = 0
- and d.dept_code = #{deptCode}
+ and d.dept_code = #{deptCode}
+ <if test="orgid != null and orgid != ''">
+ and d.orgid = #{orgid}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ and d.campusid = #{campusid}
+ </if>
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
--
Gitblit v1.9.3