From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
index a642513..f3fb8df 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
@@ -76,7 +76,7 @@
<select id="selectBaseUserInfoList" parameterType="com.ruoyi.system.domain.BaseUserInfo"
resultMap="BaseUserInfoResult">
<include refid="selectBaseUserInfoVo"/>
- <where>
+ where 1=1
<if test="usercode != null and usercode != ''">and usercode = #{usercode}</if>
<if test="account != null and account != ''">and account = #{account}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
@@ -104,7 +104,6 @@
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="deptpermission != null and deptpermission != ''">and deptpermission = #{deptpermission}</if>
<if test="wardpermission != null and wardpermission != ''">and wardpermission = #{wardpermission}</if>
- </where>
</select>
<select id="selectBaseUserInfoByUserid" parameterType="Long" resultMap="BaseUserInfoResult">
--
Gitblit v1.9.3