From af6a6f03d3da1303b6fec2cff5dbd0fd10e8ad5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:59:32 +0800
Subject: [PATCH] 1、查询产品bug 2、储值卡使用完成不设置为失效

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index 01462d3..2b3a9aa 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -246,20 +246,20 @@
 					CHANGE_ID = #{changeId},
 				</if>
 				<if test="oldShopId != null and oldShopId !='' ">
-					OLD_SHOP_ID = #{oldShopId}
+					OLD_SHOP_ID = #{oldShopId},
 				</if>
 				<if test="consumeTime != null  ">
-					consume_time = #{consumeTime}
+					consume_time = #{consumeTime},
 				</if>
 
 				<if test="reply != null  ">
-					reply = #{reply}
+					reply = #{reply},
 				</if>
 				<if test="comment != null  ">
-					comment = #{comment}
+					comment = #{comment},
 				</if>
 				<if test="overtimeNotice != null  ">
-					overtime_notice = #{overtimeNotice}
+					overtime_notice = #{overtimeNotice},
 				</if>
 		</set>
 		WHERE id=#{id} 
@@ -549,6 +549,7 @@
 		left join sys_proj_use g on b.puse_id=g.ID
 		left join sys_shop_info h on a.SHOP_ID=h.ID
 		<where>
+			and a.company_id=#{record.companyId}
 			<if test="record.queryKey != null and record.queryKey != ''">
 				and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
 			</if>
@@ -585,6 +586,7 @@
 		left join sys_users f on f.su_id=b.STAFF_ID
 		left join sys_proj_use g on b.puse_id=g.ID
 		<where>
+			and a.company_id=#{record.companyId}
 			<if test="record.queryKey != null and record.queryKey != ''">
 				and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
 			</if>

--
Gitblit v1.9.1