From 39a5520c112081aff9f55ad13c1b4b53e4136a87 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Oct 2022 15:05:43 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml
index 986be92..51b8e0d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml
@@ -354,7 +354,7 @@
left join sys_vip_info c on a.vip_id=c.id
<where>
and a.company_id=#{companyId}
- and (c.IS_DELETE is null or c.IS_DELETE = '')
+
<if test="shopId != null ">
and a.shop_id=#{shopId}
</if>
--
Gitblit v1.9.1