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这段时间会到达超时时间的任务）
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 288be10..7f7e015 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -99,14 +99,24 @@
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
- <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
+ <select id="checkRoleNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+ where r.role_name=#{roleName}
+ and r.del_flag = '0'
+ <if test="orgid != null and orgid != ''">
+ and r.orgid = #{orgid}
+ </if>
+ limit 1
</select>
- <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
+ <select id="checkRoleKeyUnique" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
+ where r.role_key=#{roleKey}
+ and r.del_flag = '0'
+ <if test="orgid != null and orgid != ''">
+ and r.orgid = #{orgid}
+ </if>
+ limit 1
</select>
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
--
Gitblit v1.9.3