From fe3669cf773ba9144a644187f0aa3225398c901f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 14:07:48 +0800
Subject: [PATCH] 小区树查询修改，场所新增修改，物业详情查询修改
---
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java | 3 ++-
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml | 1 +
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 2 +-
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 3 +++
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index 4d44956..bb36abc 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -51,7 +51,7 @@
union all
(
select
- id,
+ aoi_code as id,
community_code as parentId,
name
from jczz_district
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
index dd458f3..0bfc9e1 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.place.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
import org.springblade.modules.place.vo.PlacePractitionerVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param placePractitioner
* @return
*/
- List<PlacePractitionerVO> selectPlacePractitionerPage(IPage page, PlacePractitionerVO placePractitioner);
+ List<PlacePractitionerVO> selectPlacePractitionerPage(IPage page,@Param("placePractitioner") PlacePractitionerVO placePractitioner);
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index e96af6d..3dffc37 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -5,6 +5,9 @@
<!--自定义分页查询-->
<select id="selectPlacePractitionerPage" resultType="org.springblade.modules.place.vo.PlacePractitionerVO">
select * from jczz_place_practitioner where 1=1
+ <if test="placePractitioner.placeId!=null">
+ and place_id = #{placePractitioner.placeId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 2b8e23a..b77f501 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -189,7 +189,7 @@
if (null!=placeVO.getGridId()){
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
+ wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null==one){
// 新增
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
index a9a013b..31e245e 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
@@ -151,6 +151,7 @@
LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
LEFT JOIN blade_user bu ON locate(jpdu.user_id,bu.id)>0 and bu.is_deleted = 0
WHERE jpc.is_deleted = 0
+ and bu.real_name is not null
and jpc.id = #{propertyCompany.id}
</select>
--
Gitblit v1.9.3