From 4a338d4ab0fa19876612b2a352689a192d660c23 Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Thu, 02 Apr 2020 15:58:46 +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/SysFeedbackMapper.xml        |   79 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml       |   55 ++-
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml       |   43 +-
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml         |   71 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml          |   43 +-
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml     |   67 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml  |   63 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml       |   83 +++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml     |   87 +++---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml |   79 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml    |   75 ++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml      |   43 +-
 12 files changed, 412 insertions(+), 376 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
index e96c347..b056ced 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
@@ -12,60 +12,61 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.recordTitle != null and p.recordTitle !=''">
-                and  record_title =  #{p.recordTitle}
+            <if test="p.recordTitle != null and p.recordTitle !=''">
+                and record_title = #{p.recordTitle}
             </if>
-                                                <if test="p.userId != null and p.userId !=''">
-                and  user_id =  #{p.userId}
+            <if test="p.userId != null and p.userId !=''">
+                and user_id = #{p.userId}
             </if>
-                                                <if test="p.userName != null and p.userName !=''">
-                and  user_name =  #{p.userName}
+            <if test="p.userName != null and p.userName !=''">
+                and user_name = #{p.userName}
             </if>
-                                                <if test="p.appId != null and p.appId !=''">
-                and  app_id =  #{p.appId}
+            <if test="p.appId != null and p.appId !=''">
+                and app_id = #{p.appId}
             </if>
-                                                <if test="p.appName != null and p.appName !=''">
-                and  app_name =  #{p.appName}
+            <if test="p.appName != null and p.appName !=''">
+                and app_name = #{p.appName}
             </if>
-                                                <if test="p.recordIp != null and p.recordIp !=''">
-                and  record_ip =  #{p.recordIp}
+            <if test="p.recordIp != null and p.recordIp !=''">
+                and record_ip = #{p.recordIp}
             </if>
-                                                <if test="p.recordDetail != null and p.recordDetail !=''">
-                and  record_detail =  #{p.recordDetail}
+            <if test="p.recordDetail != null and p.recordDetail !=''">
+                and record_detail = #{p.recordDetail}
             </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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-BusinessRecords当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.BusinessRecords">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.BusinessRecords">
+        select
+        <include refid="Column_List"/>
         from business_records
         <include refid="where"/>
         order by id desc
@@ -73,8 +74,10 @@
 
     <!--定义根据-BusinessRecords当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.BusinessRecords">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from business_records
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
index 05f57b8..e496315 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
@@ -12,54 +12,55 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <if test="p.departmentId != null and p.departmentId !=''">
-                and  department_id =  #{p.departmentId}
+            <if test="p.departmentId != null and p.departmentId !=''">
+                and department_id = #{p.departmentId}
             </if>
-                                                <if test="p.doctorCount != null and p.doctorCount !=''">
-                and  doctor_count =  #{p.doctorCount}
+            <if test="p.doctorCount != null and p.doctorCount !=''">
+                and doctor_count = #{p.doctorCount}
             </if>
-                                                <if test="p.serverEndDate != null and p.serverEndDate !=''">
-                and  server_end_date =  #{p.serverEndDate}
+            <if test="p.serverEndDate != null and p.serverEndDate !=''">
+                and server_end_date = #{p.serverEndDate}
             </if>
-                                                <if test="p.totalRayCount != null and p.totalRayCount !=''">
-                and  total_ray_count =  #{p.totalRayCount}
+            <if test="p.totalRayCount != null and p.totalRayCount !=''">
+                and total_ray_count = #{p.totalRayCount}
             </if>
-                                                <if test="p.totalRecordCount != null and p.totalRecordCount !=''">
-                and  total_record_count =  #{p.totalRecordCount}
+            <if test="p.totalRecordCount != null and p.totalRecordCount !=''">
+                and total_record_count = #{p.totalRecordCount}
             </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.tenantId != null and p.tenantId !=''">
-                and  tenant_id =  #{p.tenantId}
+            <if test="p.tenantId != null and p.tenantId !=''">
+                and tenant_id = #{p.tenantId}
             </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>
 
     <!--定义根据-BusinessServer当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.BusinessServer">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.BusinessServer">
+        select
+        <include refid="Column_List"/>
         from business_server
         <include refid="where"/>
         order by id desc
@@ -67,8 +68,10 @@
 
     <!--定义根据-BusinessServer当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.BusinessServer">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from business_server
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
index 0ad6bcf..6bda2a5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
@@ -12,36 +12,37 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <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>
 
     <!--定义根据-DoctorAnswer当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.DoctorAnswer">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorAnswer">
+        select
+        <include refid="Column_List"/>
         from doctor_answer
         <include refid="where"/>
         order by id desc
@@ -49,8 +50,10 @@
 
     <!--定义根据-DoctorAnswer当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorAnswer">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from doctor_answer
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
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 3958c3f..c00ed0b 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,45 +12,46 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <if test="p.isAnswer != null and p.isAnswer !=''">
-                and  is_answer =  #{p.isAnswer}
+            <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.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
@@ -58,8 +59,10 @@
 
     <!--定义根据-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
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
index fce6ec8..d16dcce 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
@@ -12,36 +12,37 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <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>
 
     <!--定义根据-DoctorSigning当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.DoctorSigning">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorSigning">
+        select
+        <include refid="Column_List"/>
         from doctor_signing
         <include refid="where"/>
         order by id desc
@@ -49,8 +50,10 @@
 
     <!--定义根据-DoctorSigning当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorSigning">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from doctor_signing
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
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 2995a76..d151483 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
@@ -12,69 +12,70 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.hospitalId != null and p.hospitalId !=''">
-                and  hospital_id =  #{p.hospitalId}
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and hospital_id = #{p.hospitalId}
             </if>
-                                                <if test="p.hospitalName != null and p.hospitalName !=''">
-                and  hospital_name =  #{p.hospitalName}
+            <if test="p.hospitalName != null and p.hospitalName !=''">
+                and hospital_name = #{p.hospitalName}
             </if>
-                                                <if test="p.departmentId != null and p.departmentId !=''">
-                and  department_id =  #{p.departmentId}
+            <if test="p.departmentId != null and p.departmentId !=''">
+                and department_id = #{p.departmentId}
             </if>
-                                                <if test="p.departmentName != null and p.departmentName !=''">
-                and  department_name =  #{p.departmentName}
+            <if test="p.departmentName != null and p.departmentName !=''">
+                and department_name = #{p.departmentName}
             </if>
-                                                <if test="p.doctorId != null and p.doctorId !=''">
-                and  doctor_id =  #{p.doctorId}
+            <if test="p.doctorId != null and p.doctorId !=''">
+                and doctor_id = #{p.doctorId}
             </if>
-                                                <if test="p.doctorName != null and p.doctorName !=''">
-                and  doctor_name =  #{p.doctorName}
+            <if test="p.doctorName != null and p.doctorName !=''">
+                and doctor_name = #{p.doctorName}
             </if>
-                                                <if test="p.publicType != null and p.publicType !=''">
-                and  public_type =  #{p.publicType}
+            <if test="p.publicType != null and p.publicType !=''">
+                and public_type = #{p.publicType}
             </if>
-                                                <if test="p.templeteType != null and p.templeteType !=''">
-                and  templete_type =  #{p.templeteType}
+            <if test="p.templeteType != null and p.templeteType !=''">
+                and templete_type = #{p.templeteType}
             </if>
-                                                <if test="p.templeteTitle != null and p.templeteTitle !=''">
-                and  templete_title =  #{p.templeteTitle}
+            <if test="p.templeteTitle != null and p.templeteTitle !=''">
+                and templete_title = #{p.templeteTitle}
             </if>
-                                                <if test="p.templeteNote != null and p.templeteNote !=''">
-                and  templete_note =  #{p.templeteNote}
+            <if test="p.templeteNote != null and p.templeteNote !=''">
+                and templete_note = #{p.templeteNote}
             </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.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.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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-DoctorTemplete当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
+        select
+        <include refid="Column_List"/>
         from doctor_templete
         <include refid="where"/>
         order by id desc
@@ -82,8 +83,10 @@
 
     <!--定义根据-DoctorTemplete当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from doctor_templete
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index 681379b..a17426a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -12,51 +12,52 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <if test="p.hospitalId != null and p.hospitalId !=''">
-                and  hospital_id =  #{p.hospitalId}
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and hospital_id = #{p.hospitalId}
             </if>
-                                                <if test="p.hospitalName != null and p.hospitalName !=''">
-                and  hospital_name =  #{p.hospitalName}
+            <if test="p.hospitalName != null and p.hospitalName !=''">
+                and hospital_name = #{p.hospitalName}
             </if>
-                                                <if test="p.hospitalLogo != null and p.hospitalLogo !=''">
-                and  hospital_logo =  #{p.hospitalLogo}
+            <if test="p.hospitalLogo != null and p.hospitalLogo !=''">
+                and hospital_logo = #{p.hospitalLogo}
             </if>
-                                                <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
-                and  hospital_qr_image =  #{p.hospitalQrImage}
+            <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
+                and hospital_qr_image = #{p.hospitalQrImage}
             </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.tenantId != null and p.tenantId !=''">
-                and  tenant_id =  #{p.tenantId}
+            <if test="p.tenantId != null and p.tenantId !=''">
+                and tenant_id = #{p.tenantId}
             </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>
 
     <!--定义根据-HospitalScreening当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
+        select
+        <include refid="Column_List"/>
         from hospital_screening
         <include refid="where"/>
         order by id desc
@@ -64,8 +65,10 @@
 
     <!--定义根据-HospitalScreening当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from hospital_screening
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 74cf6b4..6a0222c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -12,63 +12,64 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.orderId != null and p.orderId !=''">
-                and  order_id =  #{p.orderId}
+            <if test="p.orderId != null and p.orderId !=''">
+                and order_id = #{p.orderId}
             </if>
-                                                <if test="p.proId != null and p.proId !=''">
-                and  pro_id =  #{p.proId}
+            <if test="p.proId != null and p.proId !=''">
+                and pro_id = #{p.proId}
             </if>
-                                                <if test="p.proName != null and p.proName !=''">
-                and  pro_name =  #{p.proName}
+            <if test="p.proName != null and p.proName !=''">
+                and pro_name = #{p.proName}
             </if>
-                                                <if test="p.isShare != null and p.isShare !=''">
-                and  is_share =  #{p.isShare}
+            <if test="p.isShare != null and p.isShare !=''">
+                and is_share = #{p.isShare}
             </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.ailightCount != null and p.ailightCount !=''">
-                and  ailight_count =  #{p.ailightCount}
+            <if test="p.ailightCount != null and p.ailightCount !=''">
+                and ailight_count = #{p.ailightCount}
             </if>
-                                                <if test="p.recordCount != null and p.recordCount !=''">
-                and  record_count =  #{p.recordCount}
+            <if test="p.recordCount != null and p.recordCount !=''">
+                and record_count = #{p.recordCount}
             </if>
-                                                <if test="p.proBegintime != null and p.proBegintime !=''">
-                and  pro_begintime =  #{p.proBegintime}
+            <if test="p.proBegintime != null and p.proBegintime !=''">
+                and pro_begintime = #{p.proBegintime}
             </if>
-                                                <if test="p.proEndtime != null and p.proEndtime !=''">
-                and  pro_endtime =  #{p.proEndtime}
+            <if test="p.proEndtime != null and p.proEndtime !=''">
+                and pro_endtime = #{p.proEndtime}
             </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.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.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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-ProductOrderDetail当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
+        select
+        <include refid="Column_List"/>
         from product_order_detail
         <include refid="where"/>
         order by id desc
@@ -76,8 +77,10 @@
 
     <!--定义根据-ProductOrderDetail当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from product_order_detail
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index ea25d18..df12aa3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
@@ -12,66 +12,67 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.hospitalId != null and p.hospitalId !=''">
-                and  hospital_id =  #{p.hospitalId}
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and hospital_id = #{p.hospitalId}
             </if>
-                                                <if test="p.hospitalName != null and p.hospitalName !=''">
-                and  hospital_name =  #{p.hospitalName}
+            <if test="p.hospitalName != null and p.hospitalName !=''">
+                and hospital_name = #{p.hospitalName}
             </if>
-                                                <if test="p.departmentId != null and p.departmentId !=''">
-                and  department_id =  #{p.departmentId}
+            <if test="p.departmentId != null and p.departmentId !=''">
+                and department_id = #{p.departmentId}
             </if>
-                                                <if test="p.departmentName != null and p.departmentName !=''">
-                and  department_name =  #{p.departmentName}
+            <if test="p.departmentName != null and p.departmentName !=''">
+                and department_name = #{p.departmentName}
             </if>
-                                                <if test="p.contractNo != null and p.contractNo !=''">
-                and  contract_no =  #{p.contractNo}
+            <if test="p.contractNo != null and p.contractNo !=''">
+                and contract_no = #{p.contractNo}
             </if>
-                                                <if test="p.contractTitle != null and p.contractTitle !=''">
-                and  contract_title =  #{p.contractTitle}
+            <if test="p.contractTitle != null and p.contractTitle !=''">
+                and contract_title = #{p.contractTitle}
             </if>
-                                                <if test="p.contractBeginTime != null and p.contractBeginTime !=''">
-                and  contract_begin_time =  #{p.contractBeginTime}
+            <if test="p.contractBeginTime != null and p.contractBeginTime !=''">
+                and contract_begin_time = #{p.contractBeginTime}
             </if>
-                                                <if test="p.contractEndTime != null and p.contractEndTime !=''">
-                and  contract_end_time =  #{p.contractEndTime}
+            <if test="p.contractEndTime != null and p.contractEndTime !=''">
+                and contract_end_time = #{p.contractEndTime}
             </if>
-                                                <if test="p.contractTime != null and p.contractTime !=''">
-                and  contract_time =  #{p.contractTime}
+            <if test="p.contractTime != null and p.contractTime !=''">
+                and contract_time = #{p.contractTime}
             </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.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.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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-ProductOrder当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.ProductOrder">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrder">
+        select
+        <include refid="Column_List"/>
         from product_order
         <include refid="where"/>
         order by id desc
@@ -79,8 +80,10 @@
 
     <!--定义根据-ProductOrder当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.ProductOrder">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from product_order
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
index 05cb018..3931088 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
@@ -12,63 +12,64 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.doctorId != null and p.doctorId !=''">
-                and  doctor_id =  #{p.doctorId}
+            <if test="p.doctorId != null and p.doctorId !=''">
+                and doctor_id = #{p.doctorId}
             </if>
-                                                <if test="p.doctorName != null and p.doctorName !=''">
-                and  doctor_name =  #{p.doctorName}
+            <if test="p.doctorName != null and p.doctorName !=''">
+                and doctor_name = #{p.doctorName}
             </if>
-                                                <if test="p.doctorTel != null and p.doctorTel !=''">
-                and  doctor_tel =  #{p.doctorTel}
+            <if test="p.doctorTel != null and p.doctorTel !=''">
+                and doctor_tel = #{p.doctorTel}
             </if>
-                                                <if test="p.departmentId != null and p.departmentId !=''">
-                and  department_id =  #{p.departmentId}
+            <if test="p.departmentId != null and p.departmentId !=''">
+                and department_id = #{p.departmentId}
             </if>
-                                                <if test="p.departmentName != null and p.departmentName !=''">
-                and  department_name =  #{p.departmentName}
+            <if test="p.departmentName != null and p.departmentName !=''">
+                and department_name = #{p.departmentName}
             </if>
-                                                <if test="p.hospitalId != null and p.hospitalId !=''">
-                and  hospital_id =  #{p.hospitalId}
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and hospital_id = #{p.hospitalId}
             </if>
-                                                <if test="p.hospitalName != null and p.hospitalName !=''">
-                and  hospital_name =  #{p.hospitalName}
+            <if test="p.hospitalName != null and p.hospitalName !=''">
+                and hospital_name = #{p.hospitalName}
             </if>
-                                                <if test="p.feedbackNote != null and p.feedbackNote !=''">
-                and  feedback_note =  #{p.feedbackNote}
+            <if test="p.feedbackNote != null and p.feedbackNote !=''">
+                and feedback_note = #{p.feedbackNote}
             </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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-SysFeedback当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.SysFeedback">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SysFeedback">
+        select
+        <include refid="Column_List"/>
         from sys_feedback
         <include refid="where"/>
         order by id desc
@@ -76,8 +77,10 @@
 
     <!--定义根据-SysFeedback当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysFeedback">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from sys_feedback
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
index 7f74e38..29e4dc1 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
@@ -12,36 +12,37 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                                            <if test="p.applicationName != null and p.applicationName !=''">
-                and  application_name =  #{p.applicationName}
+            <if test="p.applicationName != null and p.applicationName !=''">
+                and application_name = #{p.applicationName}
             </if>
-                                                <if test="p.className != null and p.className !=''">
-                and  class_name =  #{p.className}
+            <if test="p.className != null and p.className !=''">
+                and class_name = #{p.className}
             </if>
-                                                <if test="p.methodName != null and p.methodName !=''">
-                and  method_name =  #{p.methodName}
+            <if test="p.methodName != null and p.methodName !=''">
+                and method_name = #{p.methodName}
             </if>
-                                                <if test="p.userId != null and p.userId !=''">
-                and  user_id =  #{p.userId}
+            <if test="p.userId != null and p.userId !=''">
+                and user_id = #{p.userId}
             </if>
-                                                <if test="p.userName != null and p.userName !=''">
-                and  user_name =  #{p.userName}
+            <if test="p.userName != null and p.userName !=''">
+                and user_name = #{p.userName}
             </if>
-                                                <if test="p.clientId != null and p.clientId !=''">
-                and  client_id =  #{p.clientId}
+            <if test="p.clientId != null and p.clientId !=''">
+                and client_id = #{p.clientId}
             </if>
-                                                <if test="p.operation != null and p.operation !=''">
-                and  operation =  #{p.operation}
+            <if test="p.operation != null and p.operation !=''">
+                and operation = #{p.operation}
             </if>
-                                                <if test="p.timestamp != null and p.timestamp !=''">
-                and  timestamp =  #{p.timestamp}
+            <if test="p.timestamp != null and p.timestamp !=''">
+                and timestamp = #{p.timestamp}
             </if>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-SysLogger当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.SysLogger">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SysLogger">
+        select
+        <include refid="Column_List"/>
         from sys_logger
         <include refid="where"/>
         order by id desc
@@ -49,8 +50,10 @@
 
     <!--定义根据-SysLogger当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysLogger">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from sys_logger
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 9872679..1bc902e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -12,57 +12,58 @@
         <where>
             <!--查询条件自行添加-->
             p.is_del=0
-                                    <if test="p.id != null and p.id !=''">
-                and  id =  #{p.id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="p.proName != null and p.proName !=''">
-                and  pro_name =  #{p.proName}
+            <if test="p.proName != null and p.proName !=''">
+                and pro_name = #{p.proName}
             </if>
-                                                <if test="p.proTime != null and p.proTime !=''">
-                and  pro_time =  #{p.proTime}
+            <if test="p.proTime != null and p.proTime !=''">
+                and pro_time = #{p.proTime}
             </if>
-                                                <if test="p.proType != null and p.proType !=''">
-                and  pro_type =  #{p.proType}
+            <if test="p.proType != null and p.proType !=''">
+                and pro_type = #{p.proType}
             </if>
-                                                <if test="p.proPrice != null and p.proPrice !=''">
-                and  pro_price =  #{p.proPrice}
+            <if test="p.proPrice != null and p.proPrice !=''">
+                and pro_price = #{p.proPrice}
             </if>
-                                                <if test="p.recordCount != null and p.recordCount !=''">
-                and  record_count =  #{p.recordCount}
+            <if test="p.recordCount != null and p.recordCount !=''">
+                and record_count = #{p.recordCount}
             </if>
-                                                <if test="p.ailightCount != null and p.ailightCount !=''">
-                and  ailight_count =  #{p.ailightCount}
+            <if test="p.ailightCount != null and p.ailightCount !=''">
+                and ailight_count = #{p.ailightCount}
             </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>
-                                                <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>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-SysProduct当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.SysProduct">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SysProduct">
+        select
+        <include refid="Column_List"/>
         from sys_product
         <include refid="where"/>
         order by id desc
@@ -70,8 +71,10 @@
 
     <!--定义根据-SysProduct当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysProduct">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from sys_product
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0