From 5011c035b9902637b1cb4d08112e00239ff99381 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 23 May 2022 12:05:36 +0800
Subject: [PATCH] 合并master
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 3 ++-
1 files changed, 2 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 709e6c9..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,7 +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