From 2620b87fd24feaa0b60cd8b529cd44c3a7557c30 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:59:45 +0800
Subject: [PATCH] 1、修改树形分类可以选择自己为自己的父级的bug
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 5 ++++-
1 files changed, 4 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 baafcdc..7a5a0e5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -327,6 +327,9 @@
<![CDATA[ a.BEGIN_TIME > #{beginTime}
and a.END_TIME < #{endTime}
and a.STAFF_ID = #{suId} ]]>
+ and a.STATE !='预约取消'
+ and a.STATE !='待确认'
+ and a.STATE !='待预约'
order by a.BEGIN_TIME asc
</select>
@@ -455,7 +458,7 @@
</if>
<if test="cateId != null and cateId != '' ">
- and c.PROJ_TYPE_ID=#{cateId}
+ and c.cate_id=#{cateId}
</if>
--
Gitblit v1.9.1