From 59a2b8cdc7e6b74ff3a82f4c0b416868a3a71579 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 22 Feb 2022 14:18:28 +0800
Subject: [PATCH] 活动

---
 src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml |   50 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
index 0097005..14d3f6c 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -88,19 +88,19 @@
         WHERE loutype = #{id} and is_deleted = 0
     </select>
 
-    <select id="selectLook" resultType="java.util.HashMap">
-        SELECT GROUP_CONCAT(mechanismName) AS mechanismname
-        FROM sys_architecture
-        WHERE mechanismName LIKE '%${mechanismName}%'
-        UNION
-        SELECT GROUP_CONCAT(mechanismName) AS mechanismname
-        FROM sys_mechanism
-        WHERE mechanismName LIKE '%${mechanismName}%'
-        UNION
-        SELECT GROUP_CONCAT(mechanismName) AS mechanismname
-        FROM sys_life
-        WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0
-    </select>
+<!--    <select id="selectLook" resultType="java.util.HashMap">-->
+<!--        SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!--        FROM sys_architecture-->
+<!--        WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!--        UNION-->
+<!--        SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!--        FROM sys_mechanism-->
+<!--        WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!--        UNION-->
+<!--        SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!--        FROM sys_life-->
+<!--        WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!--    </select>-->
 
     <!--视频监控-->
     <select id="selectVideo" resultType="java.util.HashMap">
@@ -125,4 +125,28 @@
         WHERE videourl IS NOT NULL
           AND videourl != '' and is_deleted = 0
     </select>
+
+    <select id="selectLook" resultType="java.util.HashMap">
+        SELECT
+            mechanismName  AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+        FROM
+            sys_architecture
+        WHERE
+            mechanismName LIKE '%${mechanismName}%'
+          AND is_deleted = 0 UNION
+        SELECT
+            mechanismName  AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+        FROM
+            sys_mechanism
+        WHERE
+            mechanismName LIKE '%${mechanismName}%'
+          AND is_deleted = 0 UNION
+        SELECT
+            mechanismName  AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+        FROM
+            sys_life
+        WHERE
+            mechanismName LIKE '%${mechanismName}%'
+          AND is_deleted = 0
+    </select>
 </mapper>

--
Gitblit v1.9.3