From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 c32a212..7be73a3 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}
@@ -104,7 +103,7 @@
</if>
<if test="record.companyId != null and record.companyId !='' ">
- and company_id = #{record.companyId}
+ and c.company_id = #{record.companyId}
</if>
<if test="(record.comContent!=null and record.comContent!='') or (record.comContent!='' and record.comContent==0) ">
@@ -318,7 +317,7 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN biz_user b ON c.user_id = b.open_id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.openid
<where>
<include refid="where_sql"></include>
</where>
@@ -338,7 +337,7 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN biz_user b ON c.user_id = b.open_id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.id
<where>
<include refid="where_sql"></include>
</where>
@@ -379,8 +378,10 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN biz_user b ON c.user_id = b.open_id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.id
<where>
+
+
<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}
@@ -425,7 +426,7 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN biz_user b ON c.user_id = b.open_id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.openid
<where>
and c.product_id = #{record.productId}
AND p.del_flag = 2
@@ -448,13 +449,14 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN biz_user b ON c.user_id = b.open_id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.openid
<where>
<if test="record!=null">
<if test="(record.productId!=null and record.productId!='') or (record.productId!='' and record.productId==0) ">
and c.product_id = #{record.productId}
</if>
</if>
+ and c.com_audit_status=1
AND p.del_flag = 2
AND o.del_flag = 2
AND c.del_flag = 2
--
Gitblit v1.9.1