From a5c2a3b99f46866a666618bc461340aa4e679b1c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 11:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
index eb34a83..09bd9f1 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -20,7 +20,7 @@
<result column="town_name" property="streetName"/>
<result column="village_name" property="communityName"/>
- <collection property="placePoiLabelVOList" column="id" javaType="java.util.List" select="selectPlacePoiLabelList"
+ <collection property="placePoiLabelVOList" column="jpid" javaType="java.util.List" select="selectPlacePoiLabelList"
ofType="org.springblade.modules.place.entity.PlacePoiLabel"
autoMapping="true">
</collection>
@@ -41,7 +41,7 @@
color,
remark
from
- jczz_place_poi_label where place_id = #{id}
+ jczz_place_poi_label where place_id = #{jpid}
</select>
@@ -66,6 +66,7 @@
<select id="selectPlaceCheckPage" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
@@ -138,6 +139,7 @@
<select id="selectPlaceCheckById" parameterType="long" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
--
Gitblit v1.9.3