From b6dd42b974a9a2fafc511acb2df3446c52fda200 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 May 2022 14:18:51 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
index dd72e3c..977ec03 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -333,8 +333,8 @@
and a.STAFF_ID = #{suId} ]]>
and a.STATE !='预约取消'
and a.STATE !='待确认'
- and a.STATE !='待预约'
and a.STATE !='服务单结束'
+ and a.STATE !='待预约' and (c.IS_DELETE is null or c.IS_DELETE = '')
order by a.BEGIN_TIME asc
</select>
--
Gitblit v1.9.1