From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index e3b1c07..4e725c9 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -657,17 +657,20 @@
<resultMap type="org.springblade.modules.place.dto.PlaceDTO" id="PlaceDTOResult">
<result property="id" column="id" />
<result property="houseCode" column="house_code" />
+ <result property="houseCodeBinds" column="house_code_binds" />
<result property="buildingCode" column="building_code" />
<result property="principalUserId" column="principal_user_id" />
<result property="principal" column="principal" />
- <result property="principalIdCard" column="principal_id_card" />
<result property="principalPhone" column="principal_phone" />
+ <result property="principalIdCard" column="principal_id_card" />
<result property="placeName" column="place_name" />
<result property="lng" column="lng" />
<result property="lat" column="lat" />
<result property="location" column="location" />
<result property="imageUrls" column="image_urls" />
+ <result property="gridId" column="grid_id" />
<result property="gridCode" column="grid_code" />
+ <result property="jwGridCode" column="jw_grid_code" />
<result property="source" column="source" />
<result property="status" column="status" />
<result property="isScene" column="is_scene" />
@@ -769,10 +772,18 @@
<!--查询绑定的房屋-->
<select id="getHouseBindMap" resultType="java.util.Map">
select address_code as addressCode,address_name addressName from jczz_doorplate_address
- where address_code in
- <foreach collection="houseCodeBinds.split(',')" item="houseCode" separator="," open="(" close=")">
- #{houseCode}
- </foreach>
+ where
+ <choose>
+ <when test="houseCodeBinds!=null and houseCodeBinds!=''">
+ address_code in
+ <foreach collection="houseCodeBinds.split(',')" item="houseCode" separator="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </when>
+ <otherwise>
+ address_code in ('')
+ </otherwise>
+ </choose>
</select>
</mapper>
--
Gitblit v1.9.3