From f30a977b18541d2f1b9a7863b1377e5f366df9dc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 16 Nov 2020 18:01:41 +0800
Subject: [PATCH] 修改时间的bug

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
index 6cf3fed..6d4321c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -130,6 +130,32 @@
         <include refid="where"/>
         order by id desc
     </select>
+    <sql id="wherelist_last">
+        <if test="p.isScreen != null and p.isScreen !=''">
+            and is_screen = #{p.isScreen}
+        </if>
+        <if test="p.isPay != null and p.isPay !=''">
+            and is_pay = #{p.isPay}
+        </if>
+        <if test="p.isAnswer != null and p.isAnswer !=''">
+            and is_answer = #{p.isAnswer}
+        </if>
+        <if test="p.hospitalState != null and p.hospitalState !=''">
+            and hospital_state = #{p.hospitalState}
+        </if>
+        <if test="p.hospitalProvince != null and p.hospitalProvince !=''">
+            and hospital_province = #{p.hospitalProvince}
+        </if>
+        <if test="p.hospitalCity != null and p.hospitalCity !=''">
+            and hospital_city = #{p.hospitalCity}
+        </if>
+        <if test="p.hospitalArea != null and p.hospitalArea !=''">
+            and hospital_area = #{p.hospitalArea}
+        </if>
+        <if test="p.hospitalName != null and p.hospitalName !=''">
+            and hospital_name LIKE concat('%',#{p.hospitalName},'%')
+        </if>
+    </sql>
     <sql id="whereList">
         <where>
             hosisdel = 0
@@ -167,7 +193,7 @@
                                 <if test="itemto.flag">
                                 </if>
                                 <if test="!itemto.flag">
-                                    or ( hospitals.hosisdel = 0 and hospitals.hosenabled=1)
+                                    or ( hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
                                 </if>
                             </when>
                             <when test="inx==2">
@@ -186,7 +212,7 @@
                                              index="">
                                         create_user_org_code = #{itemtoto.orgCode}
                                     </foreach>
-                                    and hospitals.hosisdel = 0 and hospitals.hosenabled=1
+                                    and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>
                                     )
                                 </if>
                             </when>
@@ -196,7 +222,7 @@
                                     create_user_org_code = #{itemto.object}
                                 </if>
                                 <if test="!itemto.flag">
-                                    or (create_user_org_code = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1)
+                                    or (create_user_org_code = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
                                 </if>
                             </when>
                             <when test="inx == 4">
@@ -206,7 +232,7 @@
                                 </if>
                                 <if test="!itemto.flag">
                                     or (create_user_org_code like '${itemto.object}%' and hospitals.hosisdel = 0 and
-                                    hospitals.hosenabled=1)
+                                    hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
                                 </if>
                             </when>
                             <when test="inx == 5">
@@ -215,7 +241,7 @@
                                     hospitals.create_user_id = #{itemto.object}
                                 </if>
                                 <if test="!itemto.flag">
-                                    or (hospitals.create_user_id = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1)
+                                    or (hospitals.create_user_id = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
                                 </if>
                             </when>
                             <otherwise>

--
Gitblit v1.8.0