From ac2e836f65cf291bb3c94746df7467d99d546791 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 29 一月 2026 15:51:19 +0800
Subject: [PATCH] 【市一】用户、院区同步逻辑修改

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 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 dd3ebe6..ded67a3 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -391,10 +391,20 @@
         <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
     </select>
 
+    <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
+        where 1=1
+        and user_id != 'admin'
+        <if test="orgid != null and orgid != ''">
+            AND orgid = #{orgid}
+        </if>
+        <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
+    </select>
+
     <select id="yhyyqxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserOrgResult">
         select
             d.orgid as campusid,
-            d.del_flag,
             ud.user_id as user_id,
             ud.orgid as orgid
         FROM healthy_dept d
@@ -410,6 +420,24 @@
         <if test="campusid != null">
             AND d.orgid = #{campusid}
         </if>
+        union all
+        select
+        d.orgid as campusid,
+        udb.user_id as user_id,
+        udb.orgid as orgid
+        FROM healthy_dept d
+        JOIN healthy_user_dept_bf udb ON d.his_dept_id = udb.dept_code
+        where 1=1
+        and udb.user_id != 'admin'
+        <if test="orgid != null and orgid != ''">
+            AND udb.orgid = #{orgid}
+        </if>
+        <if test="hisUserId != null ">
+            AND udb.user_id = #{hisUserId}
+        </if>
+        <if test="campusid != null">
+            AND d.orgid = #{campusid}
+        </if>
     </select>
 
     <select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">

--
Gitblit v1.9.3