From 94462d19bb33abe9654781d791ae0163a3e0e37e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 一月 2026 16:29:07 +0800
Subject: [PATCH] 【丽水】微信已发送、已领取视为发送成功，不再进行补偿 改为 当前发送方式为微信的，且下一发送方式为短信的，微信发送状态为已发送、已领取的，跳过短信步骤
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 3c24a94..ad74ef8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -50,7 +50,6 @@
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
- <result property="campusid" column="campusid"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
@@ -67,7 +66,6 @@
u.dept_id,
u.id_card,
u.hosp_info,
- u.campusid,
u.dept_info,
u.searchscope,
u.user_name,
@@ -93,6 +91,7 @@
u.remark,
u.guid,
u.orgid,
+ u.campusid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -117,21 +116,19 @@
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
- u.campusid,
u.dept_name,
u.dept_code,
u.birthday,
u.job_phone,
u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name from sys_user
- u
+ u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ u.orgid,u,campusid,
+ d.dept_name
+ from sys_user u
left join sys_user_dept d on u.user_id = d.user_id
where u.del_flag = '0'
<if test="userId != null">
AND u.user_id = #{userId}
- </if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -141,9 +138,6 @@
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
- </if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="idCard != null and idCard != ''">
AND u.id_card = #{idCard}
@@ -184,7 +178,7 @@
</select>
<select id="getUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type,
- u.nick_name, u.user_name,u.campusid,
+ u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
u.dept_name,
@@ -192,16 +186,15 @@
u.birthday,
u.job_phone,
u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from sys_user u
+ u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ u.orgid, u.campusid
+ from sys_user u
where u.del_flag = '0'
- <if test="userId != null">
- AND u.user_id = #{userId}
- </if>
- <if test="orgid != null and orgid != ''">
+ <if test="orgid != null">
AND u.orgid = #{orgid}
</if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
+ <if test="userId != null">
+ AND u.user_id = #{userId}
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -257,7 +250,6 @@
u.email,
u.dept_code,
u.dept_name,
- u.campusid,
u.birthday,
u.job_phone,
u.phonenumber, u.status,u.id_card,
@@ -287,7 +279,6 @@
resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.hosp_info, u.dept_info,u.searchscope, u.user_name, u.user_type,
u.nick_name,
- u.campusid,
u.email,
u.his_user_id,
u.title,
@@ -321,8 +312,8 @@
<select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
- <where>
- u.del_flag = '0'
+ where 1=1
+ AND u.del_flag = '0'
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
</if>
@@ -332,7 +323,6 @@
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
</if>
- </where>
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -340,11 +330,18 @@
where u.user_id = #{userId}
</select>
- <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
+ <select id="checkUserNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select user_id, user_name
from sys_user
where user_name = #{userName}
- and del_flag = '0' limit 1
+ and del_flag = '0'
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ and campusid = #{campusid}
+ </if>
+ limit 1
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
@@ -386,9 +383,9 @@
<if test="jobPhone != null and jobPhone != ''">job_phone,</if>
<if test="birthday != null ">birthday,</if>
<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
- <if test="orgid != null and orgid != ''">orgid,</if>
<if test="deptCode != null and deptCode != ''">dept_code,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
+ <if test="orgid != null and orgid != ''">orgid,</if>
<if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
@@ -413,9 +410,9 @@
<if test="jobPhone != null and jobPhone != ''">#{jobPhone},</if>
<if test="birthday != null and birthday != ''">#{birthday},</if>
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
- <if test="orgid != null and orgid != ''">#{orgid},</if>
<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
+ <if test="orgid != null and orgid != ''">#{orgid},</if>
<if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
@@ -444,7 +441,6 @@
<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
<if test="birthday != null ">birthday=#{birthday},</if>
- <if test="orgid != null ">orgid=#{orgid},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
@@ -453,6 +449,7 @@
</if>
<if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
<if test="deptName != null and deptName != ''">dept_name=#{deptName},</if>
+ <if test="orgid != null and orgid != ''">orgid=#{orgid},</if>
<if test="campusid != null and campusid != ''">campusid=#{campusid},</if>
update_time = sysdate()
</set>
--
Gitblit v1.9.3