From 8595059e236d4a2fa034be18d40b9d6a61e12525 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 15 Mar 2021 14:37:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
index be1fdff..ead840d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -55,10 +55,12 @@
where
a.sales_user_id=#{record.userId}
and a.revenue_type=#{record.revenueType}
- <if test="orderStatus!=null" >
+ <if test="record.orderStatus!=null" >
and a.order_status=#{record.orderStatus}
</if>
- order by #{record.sort} #{record.order}
+ <if test="record.sort!=null and record.order!=null" >
+ order by ${record.sort} ${record.order}
+ </if>
</select>
--
Gitblit v1.9.1