From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 24 May 2022 15:14:21 +0800 Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha --- zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml index 6819621..b55a131 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml @@ -32,7 +32,7 @@ LEFT JOIN sys_proj_services b ON a.SERVICES_ID = b.ID LEFT JOIN sys_vip_info c ON b.VIP_ID = c.ID LEFT JOIN sys_users d on d.su_id=a.STAFF_ID - WHERE b.state='服务单结束' and (c.IS_DELETE is null or c.IS_DELETE = '') + WHERE b.state='服务单结束' ) t GROUP BY t.VIP_ID, -- Gitblit v1.9.1