From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'

---
 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