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 |    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 3c34532..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} 
@@ -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 sys_vip_info b ON c.user_id = b.id
+		LEFT JOIN sys_vip_info b ON c.user_id = b.openid
 		<where>
 		  <include refid="where_sql"></include>
 		 </where>
@@ -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>
+
+
 			<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}

--
Gitblit v1.9.1