From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 5 ++++-
1 files changed, 4 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 c6abb7f..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
@@ -98,13 +98,16 @@
public_type,
templete_type,
templete_title,
+ templete_note,
create_time
FROM
doctor_templete
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