From cb902ccd4035ef00bd2e8a598b37a8bf014f2a4b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期一, 15 四月 2024 16:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
index ec6a6d4..de396dd 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
@@ -11,6 +11,7 @@
t_mental_analysis_time_config o
LEFT JOIN toc_customer tu ON tu.customer_id = o.counselling_info_id
<where>
+ AND tu.status_flag = 1
<if test="nickName != null and nickName != ''">
AND tu.nick_name LIKE CONCAT('%',#{nickName},'%')
</if>
@@ -25,6 +26,7 @@
LEFT JOIN toc_customer u ON tc.counselling_info_id = u.customer_id
LEFT JOIN t_counselling_special_time_config stc ON stc.counselling_info_id = u.customer_id
<where>
+ AND u.status_flag = 1
<if test="mentalAnalysisStatus != null">
AND u.mental_analysis_status = #{mentalAnalysisStatus}
</if>
--
Gitblit v1.7.1