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/SysConfigMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index 0c5b29a..fc59999 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -36,24 +36,27 @@
 
     <!-- 鏌ヨ鏉′欢 -->
     <sql id="sqlwhereSearch">
-        <where>
+        where 1=1
             <if test="configId !=null">
                 and config_id = #{configId}
             </if>
             <if test="configKey !=null and configKey != ''">
                 and config_key = #{configKey}
             </if>
-        </where>
+            <if test="orgid !=null and orgid != ''">
+                and orgid = #{orgid}
+            </if>
     </sql>
 
     <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
+        limit 1
     </select>
 
     <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
-        <where>
+        where 1=1
             <if test="configName != null and configName != ''">
                 AND config_name like concat('%', #{configName}, '%')
             </if>
@@ -63,13 +66,15 @@
             <if test="configKey != null and configKey != ''">
                 AND config_key like concat('%', #{configKey}, '%')
             </if>
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
                 and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
                 and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
-        </where>
     </select>
 
     <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">

--
Gitblit v1.9.3