From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Fri, 03 Apr 2020 09:41:48 +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 |   61 ++++++++++++++++--------------
 1 files changed, 32 insertions(+), 29 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 17e6914..ad6d873 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!--医生业务服务信息表-->
-<mapper namespace="com.kidgrow.usercenter.mapper.DoctorServerMapper">
+<mapper namespace="com.kidgrow.oprationcenter.mapper.DoctorServerMapper">
     <!--定义查询列-->
     <sql id="Column_List">
 	   *
@@ -11,55 +11,58 @@
     <sql id="where">
         <where>
             <!--查询条件自行添加-->
-            p.is_del=0
-                                                            <if test="p.isAnswer != null and p.isAnswer !=''">
-                and  is_answer =  #{p.isAnswer}
+            is_del=0
+            <if test="p.isAnswer != null and p.isAnswer !=''">
+                and is_answer = #{p.isAnswer}
             </if>
-                                                <if test="p.isSigning != null and p.isSigning !=''">
-                and  is_signing =  #{p.isSigning}
+            <if test="p.isSigning != null and p.isSigning !=''">
+                and is_signing = #{p.isSigning}
             </if>
-                                                <if test="p.doctorState != null and p.doctorState !=''">
-                and  doctor_state =  #{p.doctorState}
+            <if test="p.doctorState != null and p.doctorState !=''">
+                and doctor_state = #{p.doctorState}
             </if>
-                                                <if test="p.createTime != null and p.createTime !=''">
-                and  create_time =  #{p.createTime}
+            <if test="p.createTime != null and p.createTime !=''">
+                and create_time = #{p.createTime}
             </if>
-                                                <if test="p.updateTime != null and p.updateTime !=''">
-                and  update_time =  #{p.updateTime}
+            <if test="p.updateTime != null and p.updateTime !=''">
+                and update_time = #{p.updateTime}
             </if>
-                                                <if test="p.isDel != null and p.isDel !=''">
-                and  is_del =  #{p.isDel}
+            <if test="p.isDel != null and p.isDel !=''">
+                and is_del = #{p.isDel}
             </if>
-                                                <if test="p.enabled != null and p.enabled !=''">
-                and  enabled =  #{p.enabled}
+            <if test="p.enabled != null and p.enabled !=''">
+                and enabled = #{p.enabled}
             </if>
-                                                <if test="p.createUserId != null and p.createUserId !=''">
-                and  create_user_id =  #{p.createUserId}
+            <if test="p.createUserId != null and p.createUserId !=''">
+                and create_user_id = #{p.createUserId}
             </if>
-                                                <if test="p.createUserName != null and p.createUserName !=''">
-                and  create_user_name =  #{p.createUserName}
+            <if test="p.createUserName != null and p.createUserName !=''">
+                and create_user_name = #{p.createUserName}
             </if>
-                                                <if test="p.updateUserId != null and p.updateUserId !=''">
-                and  update_user_id =  #{p.updateUserId}
+            <if test="p.updateUserId != null and p.updateUserId !=''">
+                and update_user_id = #{p.updateUserId}
             </if>
-                                                <if test="p.updateUserName != null and p.updateUserName !=''">
-                and  update_user_name =  #{p.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.usercenter.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
     </select>
 
     <!--定义根据-DoctorServer当作查询条件返回对象集合-->
-    <select id="findList" resultType="com.kidgrow.usercenter.model.DoctorServer">
-        select <include refid="Column_List"/>
+    <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorServer">
+        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