From e1e290cbef86b5a5c58b8ef238424373f00ed00b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 四月 2026 18:03:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index ded67a3..5c0653a 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -385,6 +385,7 @@
FROM healthy_user_dept
where 1=1
and user_id != 'admin'
+ and dept_type = '1'
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
@@ -393,9 +394,10 @@
<select id="yhybfxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
- FROM healthy_user_dept_bf
+ FROM healthy_user_dept
where 1=1
and user_id != 'admin'
+ and dept_type = '2'
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
--
Gitblit v1.9.3