From b63b60288025c131b7d6023d444417ab5b35e2c1 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 11:09:18 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
index 3c85b34..6977ef4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
@@ -88,7 +88,6 @@
<!-- where sql -->
<sql id="where_sql">
-
<if test="record!=null">
<if test="(record.comId!=null and record.comId!='') or (record.comId!='' and record.comId==0) ">
and com_id = #{record.comId}
@@ -381,6 +380,8 @@
LEFT JOIN shop_order o ON c.order_id = o.id
LEFT JOIN sys_vip_info b ON c.user_id = b.id
<where>
+ and (b.IS_DELETE is null or b.IS_DELETE = '')
+
<if test="record!=null">
<if test="(record.userId!=null and record.userId!='') or (record.userId!='' and record.userId==0) ">
and c.user_id = #{record.userId}
@@ -431,7 +432,7 @@
AND p.del_flag = 2
AND o.del_flag = 2
AND c.del_flag = 2
- AND c.com_audit_status = 1
+ AND c.com_audit_status = 1 and (b.IS_DELETE is null or b.IS_DELETE = '')
</where>
order by c.create_time desc
<if test="record.offset >=0 and record.limit >0">
--
Gitblit v1.9.1