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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 4732f10..225eac3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -85,6 +85,14 @@
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
+ <if test="deptCodes != null and deptCodes.size() > 0">
+ AND dept_code IN
+ <foreach collection="deptCodes" item="deptCodeItem" open="("
+ separator=","
+ close=")">
+ #{deptCodeItem}
+ </foreach>
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
order by d.dept_type asc, d.parent_id, d.order_num
@@ -120,12 +128,14 @@
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
+ limit 1
</select>
<select id="selectDeptByCode" parameterType="string" resultMap="SysDeptResult">
select d.dept_id,
d.parent_id,
d.campusid,
+ d.orgid,
d.dept_code,
d.dept_type,
d.ancestors,
@@ -143,9 +153,10 @@
<if test="orgid != null and orgid != ''">
and d.orgid = #{orgid}
</if>
- <if test="campusid != null and campusid != ''">
- and d.campusid = #{campusid}
+ <if test="deptType != null and deptType != ''">
+ and d.dept_type = #{deptType}
</if>
+ limit 1
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
@@ -167,6 +178,8 @@
from sys_dept
where find_in_set(#{deptId}, ancestors)
</select>
+
+
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*)
@@ -270,4 +283,17 @@
where dept_id = #{deptId}
</delete>
+ <select id="selectSysDeptListBySysUserDept" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept"
+ resultMap="SysDeptResult">
+ <include refid="selectDeptVo"/>
+ inner join sys_user_dept ud
+ on d.dept_code = ud.dept_code
+ where 1=1
+ 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}</if>
+ <if test="userId != null">and ud.user_id = #{userId}</if>
+ <if test="deptType != null and deptType != ''">and d.dept_type = #{deptType}</if>
+ </select>
</mapper>
--
Gitblit v1.9.3