From 1e228c1191996a8e704cf36dc8042b1c6ca81ef1 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 04 Nov 2020 10:59:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
index 9d7dec6..c28b6ad 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
@@ -12,54 +12,58 @@
         <where>
             <!--查询条件自行添加-->
             is_del=0
-                                                            <if test="isAnswer != null and isAnswer !=''">
-                and  is_answer =  #{isAnswer}
+            <if test="p.isAnswer != null and p.isAnswer !=''">
+                and is_answer = #{p.isAnswer}
             </if>
-                                                <if test="isSigning != null and isSigning !=''">
-                and  is_signing =  #{isSigning}
+            <if test="p.isSigning != null and p.isSigning !=''">
+                and is_signing = #{p.isSigning}
             </if>
-                                                <if test="doctorState != null and doctorState !=''">
-                and  doctor_state =  #{doctorState}
+            <if test="p.doctorState != null and p.doctorState !=''">
+                and doctor_state = #{p.doctorState}
             </if>
-                                                <if test="createTime != null and createTime !=''">
-                and  create_time =  #{createTime}
+            <if test="p.createTime != null and p.createTime !=''">
+                and create_time = #{p.createTime}
             </if>
-                                                <if test="updateTime != null and updateTime !=''">
-                and  update_time =  #{updateTime}
+            <if test="p.updateTime != null and p.updateTime !=''">
+                and update_time = #{p.updateTime}
             </if>
-                                                <if test="isDel != null and isDel !=''">
-                and  is_del =  #{isDel}
+            <if test="p.isDel != null and p.isDel !=''">
+                and is_del = #{p.isDel}
             </if>
-                                                <if test="enabled != null and enabled !=''">
-                and  enabled =  #{enabled}
+            <if test="p.enabled != null and p.enabled !=''">
+                and enabled = #{p.enabled}
             </if>
-                                                <if test="createUserId != null and createUserId !=''">
-                and  create_user_id =  #{createUserId}
+            <if test="p.createUserId != null and p.createUserId !=''">
+                and create_user_id = #{p.createUserId}
             </if>
-                                                <if test="createUserName != null and createUserName !=''">
-                and  create_user_name =  #{createUserName}
+            <if test="p.createUserName != null and p.createUserName !=''">
+                and create_user_name = #{p.createUserName}
             </if>
-                                                <if test="updateUserId != null and updateUserId !=''">
-                and  update_user_id =  #{updateUserId}
+            <if test="p.updateUserId != null and p.updateUserId !=''">
+                and update_user_id = #{p.updateUserId}
             </if>
-                                                <if test="updateUserName != null and updateUserName !=''">
-                and  update_user_name =  #{updateUserName}
+            <if test="p.updateUserName != null and p.updateUserName !=''">
+                and update_user_name = #{p.updateUserName}
             </if>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-DoctorServer当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.DoctorServer">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorServer">
+        select
+        <include refid="Column_List"/>
         from doctor_server
         <include refid="where"/>
         order by id desc
+        limit 1
     </select>
 
     <!--定义根据-DoctorServer当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorServer">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from doctor_server
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0