From 92b54c0e03ba376c1f6deea2486694c5386dd347 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 17 Jun 2024 10:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/OperatingMapper.xml | 17 +++---
 .../system/service/OrgServiceImplTest.java    | 52 +++++++++----------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
index 1b44061..02381e8 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
@@ -44,7 +44,7 @@
         LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
         LEFT JOIN tb_device_value thdv ON tdd.id = thdv.attribute_id
         LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
-        WHERE    tbd.devic_type = 1908  and  tpb.bid_code = #{bidCode}
+        WHERE    tbd.devic_type = 1908  and  tpb.bid_code = #{bidCode}   and tbd.del_flag=0
             <if test="deviceId!=null and deviceId!=''">
                and   tbd.device_id=#{deviceId}
             </if>
@@ -57,12 +57,9 @@
             tbd.device_id AS id,
             tbd.device_name AS deviceName,
             tbd.status AS status
-        FROM
-            tb_bd_device tbd
-                LEFT JOIN
-            tb_pro_bd tpb ON  tpb.id = tbd.bd_id
-        WHERE
-            tbd.devic_type = 1910 and tpb.bid_code = #{bidCode}
+        FROM   tb_bd_device tbd
+        LEFT JOIN tb_pro_bd tpb ON  tpb.id = tbd.bd_id
+        WHERE  tbd.devic_type = 1910 and tpb.bid_code = #{bidCode}
 
     </select>
 
@@ -110,10 +107,10 @@
         thdv.unit
         FROM tb_bd_device tbd
         LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
-        LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
+        LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id AND ta.del_flag=0
         LEFT JOIN tb_device_value thdv ON tdd.id = thdv.attribute_id
-        LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
-        WHERE tpb.bid_code = #{bidCode}   and   tbd.devic_type = 1908
+        LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id   and tpb.del_flag=0
+        WHERE tpb.bid_code = #{bidCode}   and   tbd.devic_type = 1908  and tbd.del_flag=0
         <if test="deviceId != null and deviceId != ''">
             AND tbd.device_id LIKE CONCAT('%', #{deviceId}, '%')
         </if>
diff --git a/securitycontrol-model/securitycontrol-system/src/test/java/com/securitycontrol/system/service/OrgServiceImplTest.java b/securitycontrol-model/securitycontrol-system/src/test/java/com/securitycontrol/system/service/OrgServiceImplTest.java
index f24febc..fbcef6c 100644
--- a/securitycontrol-model/securitycontrol-system/src/test/java/com/securitycontrol/system/service/OrgServiceImplTest.java
+++ b/securitycontrol-model/securitycontrol-system/src/test/java/com/securitycontrol/system/service/OrgServiceImplTest.java
@@ -1,26 +1,26 @@
-package com.securitycontrol.system.service;
-
-
-import com.securitycontrol.common.core.domain.Result;
-import com.securitycontrol.entity.system.vo.OrgVo;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.xml.ws.soap.Addressing;
-import java.util.List;
-
-@SpringBootTest
-public class OrgServiceImplTest {
-
-
-    @Autowired
-    OrgService service;
-
-
-    @Test
-    public void getOrgList() {
-        Result<List<OrgVo>> list = service.getOrgList(null);
-        System.err.println("测试");
-    }
-}
+//package com.securitycontrol.system.service;
+//
+//
+//import com.securitycontrol.common.core.domain.Result;
+//import com.securitycontrol.entity.system.vo.OrgVo;
+//import org.junit.jupiter.api.Test;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//import javax.xml.ws.soap.Addressing;
+//import java.util.List;
+//
+//@SpringBootTest
+//public class OrgServiceImplTest {
+//
+//
+//    @Autowired
+//    OrgService service;
+//
+//
+//    @Test
+//    public void getOrgList() {
+//        Result<List<OrgVo>> list = service.getOrgList(null);
+//        System.err.println("测试");
+//    }
+//}