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/SysDeptMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 4350001..225eac3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -135,6 +135,7 @@
select d.dept_id,
d.parent_id,
d.campusid,
+ d.orgid,
d.dept_code,
d.dept_type,
d.ancestors,
@@ -291,7 +292,7 @@
and d.del_flag = 0
and ud.del_flag = 0
<if test="orgid != null">and d.orgid = #{orgid} and ud.orgid = #{orgid}</if>
- <if test="campusid != null">and d.campusid = #{campusid} and ud.campusid = #{campusid}</if>
+ <if test="campusid != null">and d.campusid = #{campusid}</if>
<if test="userId != null">and ud.user_id = #{userId}</if>
<if test="deptType != null and deptType != ''">and d.dept_type = #{deptType}</if>
</select>
--
Gitblit v1.9.3