From eb856c050d5c20c69ba490046f597b1f993a06da Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 25 Aug 2020 15:53:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/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