From 46110cd69b178a03fed0633d45e6ca5265de630d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Fri, 07 Oct 2022 13:58:47 +0800 Subject: [PATCH] Merge branch 'score_shop' --- zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml | 4 ++-- 1 files changed, 2 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 6977ef4..7be73a3 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml @@ -380,7 +380,7 @@ 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) "> @@ -432,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 (b.IS_DELETE is null or b.IS_DELETE = '') + AND c.com_audit_status = 1 </where> order by c.create_time desc <if test="record.offset >=0 and record.limit >0"> -- Gitblit v1.9.1