From f0596fb2bf8fd0ecd8332b176549dad290a6a78d Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 19:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
index cfda5fb..dca1e77 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
@@ -105,7 +105,9 @@
 WHERE
 	is_del = 0
 	AND enabled = 1
-	AND templete_type = #{p.templeteType}
+	<if test="p.templeteType!=null and p.templeteType!=''">
+        AND templete_type = #{p.templeteType}
+    </if>
 	AND((
 			hospital_id IS NULL
 			AND hospital_id IS NULL

--
Gitblit v1.8.0