From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1,患者过滤状态修改(之前只支持发送之前的过滤,现在支持发送之后的过滤,如果任务发送后,外链不能再打开) 2.在出入院表新增入院申请单字段 3.采集入院数据时,同时要采集importanceFlagCode    emergencyLevelCode 4.外链的发送,也要查询子任务状态,如果是不执行,也不能再发送

---
 smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
index f77a682..6e21fb5 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.SysUserRole2Mapper">
 
-    <resultMap type="SysUserRole" id="SysUserRoleResult">
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysUserRole" id="SysUserRoleResult">
         <result property="userId" column="user_id"/>
         <result property="roleId" column="role_id"/>
         <result property="guid" column="guid"/>
@@ -23,6 +23,15 @@
         where role_id = #{roleId}
     </select>
 
+    <select id="selectUserRoleByRoleIdAndUserId" resultMap="SysUserRoleResult">
+        select user_id,role_id,guid,orgid
+        from sys_user_role
+        where 1=1
+            <if test="roleId != null ">and role_id = #{roleId}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+
+    </select>
+
     <delete id="deleteUserRole" parameterType="Long">
         delete from sys_user_role where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">

--
Gitblit v1.9.3