From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c7f5fcd..3693f6e
--- a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
@@ -43,7 +43,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</select>
@@ -75,8 +74,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
-
</insert>
@@ -115,7 +112,6 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
@@ -158,7 +154,10 @@
COUNT(1) count
FROM
f_floor f
- where f.`community_id` = #{communityId}
+ where 1=1
+ <if test="communityId !=null and communityId != ''">
+ and f.`community_id` = #{communityId}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id= #{floorId}
</if>
@@ -183,17 +182,16 @@
<if test="bId !=null and bId != ''">
and f.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and f.user_id= #{userId}
- </if>
+
<if test="floorNum !=null and floorNum != ''">
and f.floor_num= #{floorNum}
</if>
AND f.`status_cd` = '0'
</select>
+
+
<!-- 鏌ヨ灏忓尯 鍐呯殑妤� -->
<select id="queryFloors" parameterType="Map" resultType="Map">
-
SELECT
f.`floor_id` floorId,
f.`floor_num` floorNum,
@@ -204,7 +202,10 @@
f.floor_area floorArea
FROM
f_floor f
- where f.`community_id` = #{communityId}
+ where 1=1
+ <if test="communityId !=null and communityId != ''">
+ and f.`community_id` = #{communityId}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id= #{floorId}
</if>
@@ -241,6 +242,5 @@
LIMIT #{page}, #{row}
</if>
</select>
-
</mapper>
--
Gitblit v1.8.0