From c0988ce95ab6a518aefe843d9cfd84d1515cdc00 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 15 十月 2026 16:18:40 +0800
Subject: [PATCH] 【丽水】1. /smartor/serviceSubtask/getCurrentUserServiceSubtaskCount工作台里加即将超时数量字段      2. /smartor/serviceSubtask/querySubtaskList 给一个列表可以查询多少小时(可选)即将超时的随访服务,如:48小时内即将超时任务(今天15号10.40到17号10.40这段时间会到达超时时间的任务)

---
 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