From 55b4867bb7e89cbde093a9ae55e6a8882195a3e4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 02 Nov 2023 14:23:36 +0800
Subject: [PATCH] 测站名称模糊查询修改

---
 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java         |    4 ++--
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
index 6cb5886..ad1e076 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -42,8 +42,8 @@
 		PropsUtil.setProperty(props, "spring.cloud.nacos.password", LauncherConstant.NACOS_PASSWORD);
 
 		//自定义注册
-//		PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
-//		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
+		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
 
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 		PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index 71971d7..62e53fc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -86,7 +86,7 @@
             AND NAG.POINT_id = #{vo.pointId}
         </if>
         <if test="vo.cdName != null and vo.cdName !=''">
-            AND acb."cd_name" LIKE CONCAT('%',#{vo.cdName},'%')
+            AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
         </if>
         AND NAG.dam_id =  #{vo.damId}
     </select>

--
Gitblit v1.9.3