From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
index 5907974..8cb18d2 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="org.springblade.modules.property.mapper.PropertyCompanyDistrictMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="propertyCompanyDistrictResultMap" type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
+ <resultMap id="propertyCompanyDistrictResultMap"
+ type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
<result column="id" property="id"/>
<result column="property_company_id" property="propertyCompanyId"/>
<result column="district_id" property="districtId"/>
@@ -24,7 +25,8 @@
</resultMap>
<!--自定义分页查询-->
- <select id="selectPropertyCompanyDistrictPage" resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
+ <select id="selectPropertyCompanyDistrictPage"
+ resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
select
jpcd.*,
jd.name as districtName,
@@ -53,17 +55,19 @@
</if>
</select>
- <select id="getDistictUserByCode" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity">
- SELECT
- bu.*
+ <select id="getDistictUserByCode" resultType="org.springblade.modules.system.vo.UserVO">
+ SELECT
+ bu.*,
+ jpc.name distictName
FROM
blade_user bu
LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id
LEFT JOIN jczz_property_company_district jpcd ON jpdu.property_company_district_id = jpcd.id
+ LEFT JOIN jczz_property_company jpc on jpc.id = jpcd.property_company_id
LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id
LEFT JOIN jczz_doorplate_address jda ON jda.aoi_code = jd.aoi_code
WHERE
- jda.address_code = #{houseCode}
+ jda.address_code = #{houseCode} and bu.is_deleted = 0
</select>
--
Gitblit v1.9.3