From c8cdba0d34f57835a96233a7f0a7eaa35774dd6f Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Wed, 09 Dec 2020 18:28:06 +0800
Subject: [PATCH] 增加通过关键字查询机构列表

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

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 c419e42..d70c2e3 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
@@ -170,8 +170,9 @@
         <include refid="whereforall"/>
         order by
         DE.pro_endtime ASC,
+        DE.ailight_count ASC,
         DE.pro_begintime ASC,
-        DE.id asc
+        DE.id ASC
     </select>
 
     <select id="getEnabledCount" resultType="int" parameterType="long">
@@ -260,7 +261,9 @@
 WHERE
 	order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 )
 	AND is_del = 0
-	AND enabled = 1
+        <if test="enabled!=null">
+            and enabled=#{enabled}
+        </if>
 ORDER BY id DESC
     </select>
 	<select id="getUserdProduct" resultType="int">

--
Gitblit v1.8.0