From e3ccb13fdd386d41ea2f721924861f6bb64e6708 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 14:46:09 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index 9baed01..849f191 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -1236,9 +1236,10 @@
seal_pice price,
is_present isPresent,
unit unit,
- measure measure
+ measure measure,
+ a.good_type goodsType
from shopping_goods a
- where 1=1
+ where 1=1 and staus = '上架'
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(name,#{record.queryKey}) or instr(code ,#{record.queryKey}) or instr(zjm ,#{record.queryKey}))
</if>
@@ -1258,7 +1259,7 @@
<select id="selectShopppingGoodsAipTotal" resultType="java.lang.Integer">
select count(1)
from shopping_goods a
- where 1=1
+ where 1=1 and staus = '上架'
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(name,#{record.queryKey}) or instr(code ,#{record.queryKey}) or instr(zjm ,#{record.queryKey}))
</if>
--
Gitblit v1.9.1