From f80da6a883257cb686dc23bf0c605bf618b4239e Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 27 Feb 2024 10:58:29 +0800
Subject: [PATCH] 物业公司人员查询去重

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml          |   26 ++++++++++++--------------
 src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java |    2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
index e15ee51..d66dea5 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
@@ -61,7 +61,7 @@
 	/**
 	 * 负责人姓名
 	 */
-	@ApiModelProperty(value = "负责人姓名")
+	@ApiModelProperty(value = "负责人id")
 	private String principal;
 	/**
 	 * 负责人电话
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 38d0d0e..478bdcd 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
@@ -138,21 +138,19 @@
 
     <!--自定义详情查询-->
     <select id="getDetail" resultMap="propertyCompanyDetailMap">
-        SELECT
-            jpc.*,
-            jpcd.principal,
-            jpcd.principal_phone AS principalPhone,
-            jpdu.id AS cid,
-            bu.real_name,
-            bu.phone AS companyPersonPhone
-        FROM
-            jczz_property_company jpc
-            LEFT JOIN jczz_property_company_district jpcd ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
-            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
+        SELECT DISTINCT jpc.*,
+                        jpcd.principal,
+                        jpcd.principal_phone AS principalPhone,
+                        bu.real_name,
+                        bu.phone             AS companyPersonPhone
+        FROM jczz_property_company jpc
+                 LEFT JOIN jczz_property_company_district jpcd
+                           ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
+                 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}
+          and bu.real_name is not null
+          and jpc.id = #{propertyCompany.id}
     </select>
 
     <select id="getDetailVO" resultType="org.springblade.modules.property.vo.PropertyCompanyDetailVO">

--
Gitblit v1.9.3