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/ConsumptionRecordMapper.xml | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
index 5eefa38..d0898fe 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
@@ -65,15 +65,12 @@
SELECT * FROM `consumption_record`
where record_type=1
and update_time is null
- <where>
- <if test="p!=null and p.size()>0">
+ <if test="DetailList!=null and DetailList.size()>0">
and pro_order_detail_id in
- <foreach item="item" index="index" collection="p" open="(" close=")" separator=",">
+ <foreach item="item" index="index" collection="DetailList" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
- </where>
- and pro_order_detail_id in (1,1)
order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0