From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44: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/hive/SysStoreInfoDao.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
index 6f41218..7c421b5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -406,6 +406,10 @@
<if test="record.batch != null and record.batch !='' ">
and batch = #{record.batch}
</if>
+
+ <if test="record.queryKey != null and record.queryKey !='' ">
+ and (instr(c.name,#{record.queryKey}) or instr(c.goods_no, #{record.queryKey}) or instr(c.zjm, #{record.queryKey}))
+ </if>
<if test="record.storeId != null and record.storeId !='' ">
and STORE_ID = #{record.storeId}
</if>
@@ -479,6 +483,9 @@
<if test="record.batch != null and record.batch !='' ">
and batch = #{record.batch}
</if>
+ <if test="record.queryKey != null and record.queryKey !='' ">
+ and (instr(c.name,#{record.queryKey}) or instr(c.goods_no, #{record.queryKey}) or instr(c.zjm, #{record.queryKey}))
+ </if>
<if test="record.storeId != null and record.storeId !='' ">
and STORE_ID = #{record.storeId}
</if>
--
Gitblit v1.9.1