From a3c965e53272c71e53e8dfa814abd0d0fc175172 Mon Sep 17 00:00:00 2001
From: 25604 <ljf25604@163.com>
Date: Thu, 6 Nov 2025 19:41:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A1=A5=E6=B0=B4=E5=9B=9E=E6=B0=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mh/user/mapper/NowDataMapper.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java b/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java
index 9f9c81f..2a9aefb 100644
--- a/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java
+++ b/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java
@@ -462,9 +462,9 @@ public interface NowDataMapper {
             "  SELECT " +
             "   1 " +
             "  FROM " +
-            "   now_data " +
+            "   now_data n1 " +
             "  WHERE " +
-            "   up_water_state = '运行') THEN '运行' " +
+            "   n1.up_water_state = '运行' AND n1.building_id = now_data.building_id) THEN '运行' " +
             "  ELSE '不运行' " +
             " END AS up_water_state, " +
             " CASE " +
@@ -472,9 +472,9 @@ public interface NowDataMapper {
             "  SELECT " +
             "   1 " +
             "  FROM " +
-            "   now_data " +
+            "   now_data n2 " +
             "  WHERE " +
-            "   use_water_state = '运行') THEN '运行' " +
+            "   n2.use_water_state = '运行' AND n2.building_id = now_data.building_id) THEN '运行' " +
             "  ELSE '不运行' " +
             " END AS use_water_state, " +
             " CASE " +
@@ -482,9 +482,9 @@ public interface NowDataMapper {
             "  SELECT " +
             "   1 " +
             "  FROM " +
-            "   now_data " +
+            "   now_data n3 " +
             "  WHERE " +
-            "   back_water_state = '运行') THEN '运行' " +
+            "   n3.back_water_state = '运行' AND n3.building_id = now_data.building_id) THEN '运行' " +
             "  ELSE '不运行' " +
             " END AS back_water_state " +
             "FROM " +
@@ -493,6 +493,7 @@ public interface NowDataMapper {
             " building_id = #{buildingId} and convert(varchar(10), cur_date, 120) = convert(varchar(10), getdate(), 120) ")
     Map<String, Object> selectTopOneState(@Param("buildingId") String buildingId);
 
+
     @Select("<script>" +
             "select Convert(decimal(18,1),max(CAST(water_temp as FLOAT))) from now_data where  building_id=#{buildingId} " +
             "<if test='temp != null'>" +