From 824691c5f2e538fd83e75701f0c436ff5f4d8d2b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 09 Jun 2022 15:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 0e05a28..5fc09d3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -165,6 +165,7 @@
 		LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
 		left join sys_proj_services l on a.service_order_id=l.id
 		<where>
+
 			<if test="record!=null">
 				<if
 						test="(record.shopId!=null and record.shopId!='') or  (record.shopId!='' and record.shopId==0)  ">
@@ -266,6 +267,7 @@
 		LEFT JOIN shopping_goods_category j ON i.parent_id = j.id
 		left join sys_proj_services l on a.service_order_id=l.id
 		<where>
+
 			<if test="record!=null">
 				<if
 						test="(record.shopId!=null and record.shopId!='') or  (record.shopId!='' and record.shopId==0)  ">

--
Gitblit v1.9.1