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/common/OperstionLogDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml
index d1018b6..3fe7b82 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml
@@ -24,7 +24,7 @@
LEFT JOIN sys_vip_info c ON a.vip_id = c.id
LEFT JOIN sys_shop_info d ON a.shop_id = d.id
<where>
- a.company_id=#{param.companyId} and (c.IS_DELETE is null or c.IS_DELETE = '')
+ a.company_id=#{param.companyId}
<if test="param.shopId != null and param.shopId != 0 ">
and a.shop_id=#{param.shopId}
</if>
--
Gitblit v1.9.1