From 58bad800a9e1ad18c0713d7771b339eea94d9923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 26 Dec 2024 22:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/device/DevTowerDataCollideMapper.xml     | 2 +-
 .../main/resources/mapper/device/DevTowerDataLimitMapper.xml  | 4 ++--
 .../main/resources/mapper/device/DevTowerDataLocalMapper.xml  | 4 ++--
 .../main/resources/mapper/device/DevTowerDataRoundMapper.xml  | 4 ++--
 .../main/resources/mapper/device/DevTowerDataRunMapper.xml    | 4 ++--
 .../resources/mapper/device/DevTowerDataWarningMapper.xml     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
index e1fed284..0c481f6c 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDevTowerDataCollideList" parameterType="DevTowerDataCollide" resultMap="DevTowerDataCollideResult">
         <include refid="selectDevTowerDataCollideVo"/>
         <where>
-            <if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
+            <if test="cfgId != null">and dtdc.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdc.dept_id = #{deptId}</if>
             <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
index 24f28a53..06c0a8ad 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
@@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
-            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
-            <if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
+            <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
+            <if test="deptName != null and deptName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdl.device_source = #{deviceSource}</if>
             <if test="towerId != null  and towerId != ''"> and dtdl.tower_id = #{towerId}</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
index eeeef086..84d1c990 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
-            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
-            <if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
+            <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
+            <if test="deptName != null and deptName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdl.device_source = #{deviceSource}</if>
             <if test="towerId != null  and towerId != ''"> and dtdl.tower_id = #{towerId}</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
index 8953005a..415a9609 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
@@ -61,8 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
-            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
-            <if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
+            <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
+            <if test="deptName != null and deptName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
             <if test="towerId != null  and towerId != ''"> and dtdr.tower_id = #{towerId}</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
index 12367e4c..43d036a7 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
@@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
-            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
-            <if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
+            <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
+            <if test="deptName != null and deptName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
             <if test="warnings != null  and warnings != ''"> and dtdr.warnings is not null </if>
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
index b1ed8f0c..de5a402a 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfgId != null">and dtdw.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
             <if test="deptId != null "> and dtdw.dept_id = #{deptId}</if>
-            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
-            <if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
+            <if test="projectName != null and projectName != ''"> and dtdw.project_id in (select spv.id from sur_project spv where spv.projectName like concat('%', #{projectName}, '%'))</if>
+            <if test="deptName != null and deptName != ''"> and dtdw.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdw.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdw.device_source = #{deviceSource}</if>
             <if test="towerId != null  and towerId != ''"> and dtdw.tower_id = #{towerId}</if>