From a21946b5a2d500a32ced2d789c68b4cc7f651a60 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 18 三月 2026 10:53:01 +0800
Subject: [PATCH] 【丽水】selectDeptByCode 增加类型判断（科室/病区）
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 3 +++
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, 8 insertions(+), 5 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 039c1a6..f470d0a 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(@Param("orgid") String orgid, @Param("deptCode") String deptCode);
+ public SysDept selectDeptByCode(@Param("deptType") String deptType, @Param("orgid") String orgid, @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 0a9d673..3441d8d 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(user.getOrgid(), deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -590,7 +590,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -673,7 +673,7 @@
// }
if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
for (String deptCode : user.getDeptCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -699,7 +699,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), 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 ce7d430..2e18b43 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -144,6 +144,9 @@
<if test="orgid != null and orgid != ''">
and d.orgid = #{orgid}
</if>
+ <if test="deptType != null and deptType != ''">
+ and d.dept_type = #{deptType}
+ </if>
limit 1
</select>
--
Gitblit v1.9.3