From fc6255ded51b320e5b52023832a90bd08f05c560 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 2 Dec 2024 14:30:41 +0800
Subject: [PATCH] 12

---
 .../project/outside/service/impl/OutSideServiceImpl.java    | 2 +-
 .../src/main/resources/mybatis/oil/OilMonitorMapper.xml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java
index e197908..d328f76 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java
@@ -83,7 +83,7 @@ public class OutSideServiceImpl implements OutSideService {
         if (rootNode.isArray()) {
             for (JsonNode node : rootNode) {
                 SensorData sd = insertOldData(node);
-                
+
                 outSideMapper.insertDevice(sd);
             }
         } else {
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
index 7068642..9c83b0b 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
@@ -242,8 +242,8 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
         LEFT JOIN th_device_deal d ON th_device_report.id = d.report_id
         <where>
             (th_device_report.zt='一级报警' or th_device_report.zt='二级报警')
-            <if test="deptId != null">
-                and th_device_report.sn IN (
+            <if test="deptId != null and deptId != 228">
+            and th_device_report.sn IN (
                     SELECT td.sn
                     FROM th_device td
                     LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
@@ -330,7 +330,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
             <if test="endTime != null">and report_time &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
             <if test="sn != null">and th_device_report.sn=  #{sn}</if>
             <if test="name != null">and t.name like concat('%', #{name}, '%')</if>
-            <if test="deptId != null">and t.dept_id IN
+            <if test="deptId != null and deptId != 228">and t.dept_id IN
                 (SELECT dept_id
                 FROM sys_dept START WITH dept_id = #{deptId}
                 CONNECT BY PRIOR dept_id = parent_id)</if>