From 1a4792fdff667d3b9590c6ab4c085a08cdca1399 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 24 Oct 2024 14:07:18 +0800
Subject: [PATCH] 修改端口
---
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 14ee534..9095569 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -82,14 +82,14 @@
WHERE panoramaurl IS NOT NULL
AND panoramaurl!='' and is_deleted = 0
</select>
- <select id="selectArchALL" resultType="java.util.HashMap">
- SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
+
+ <select id="selectArchALL" resultType="org.springblade.modules.architecture.entity.Architecture">
+ SELECT id,jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
FROM sys_architecture
WHERE is_deleted = 0
- -- UNION
--- SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
--- FROM sys_mechanism
--- WHERE is_deleted = 0
+ <if test="architecture.campus!=null and architecture.campus!=''">
+ and campus = #{architecture.campus}
+ </if>
</select>
<select id="selectIns" resultType="java.lang.String">
@@ -159,6 +159,7 @@
panoramaurl
FROM sys_architecture
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
UNION
SELECT mechanismName AS mechanismname,
@@ -179,6 +180,7 @@
panoramaurl
FROM sys_mechanism
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
UNION
SELECT mechanismName AS mechanismname,
@@ -199,6 +201,7 @@
panoramaurl
FROM sys_life
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3