From 844e37605b65a2a3d95b466d663d91ac8584350c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 21:28:17 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 53956bf..baafcdc 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -616,7 +616,7 @@
<select id="selectByProjUse" resultMap="SysBeauticianStateMap">
select * from sys_beautician_state
- where state!=#{state} puse_id in
+ where state!=#{state} and puse_id in
<foreach collection="list" index="index" item="item" open="("
separator="," close=")">
#{item.id}
@@ -625,6 +625,6 @@
<select id="selectBeauticianStateByPuseIdAndNoStatus" resultMap="SysBeauticianStateMap">
select * from sys_beautician_state
- where puse_id=#{puseId} ans state!=#{state}
+ where puse_id=#{puseId} and state!=#{state}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1