From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index ad7f771..54b0ee9
--- a/java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml
@@ -73,8 +73,10 @@
     <select id="getCommunityLocationInfo" parameterType="Map" resultType="Map">
         select t.location_name,t.location_name locationName,t.location_id,t.location_id
         locationId,t.location_type,t.location_type locationType,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id
-        bId,t.community_id,t.community_id communityId
+        bId,t.community_id,t.community_id communityId,d.name locationTypeName,
+        t.location_obj_id locationObjId,t.location_obj_name locationObjName
         from community_location t
+        left join t_dict d on t.location_type = d.status_cd and d.table_name = 'community_location' and d.table_columns = 'location_type'
         where 1 =1
         <if test="locationName !=null and locationName != ''">
             and t.location_name= #{locationName}
@@ -85,6 +87,12 @@
         <if test="locationType !=null and locationType != ''">
             and t.location_type= #{locationType}
         </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            and t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName !=null and locationObjName != ''">
+            and t.location_obj_name= #{locationObjName}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>

--
Gitblit v1.8.0