From 64df0d71b0dc63a2e5c048b6508492aa10f4070f Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Thu, 11 Jul 2024 10:22:16 +0800
Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/controller/EquipmentController.java    | 3 ---
 das/src/main/resources/mapper/SysEquipmentMapper.xml         | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
index 721a8500..97c17ce4 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
@@ -6,10 +6,7 @@ import com.das.common.constant.SysAuthorityIds;
 import com.das.common.exceptions.ServiceException;
 import com.das.common.result.R;
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.StringUtils;
-import com.das.modules.auth.entity.SysOrg;
 import com.das.modules.equipment.domain.dto.SysEquipmentDto;
-import com.das.modules.equipment.domain.dto.SysIotModelDto;
 import com.das.modules.equipment.domain.vo.EquipmentTypeVo;
 import com.das.modules.equipment.domain.vo.SysEquipmentVo;
 import com.das.modules.equipment.service.SysEquipmentService;
diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index 3704454b..ec3b8a79 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -72,12 +72,15 @@
             <if test="info.code != null and info.code != ''">
                 and t.code like concat('%',#{info.code},'%')
             </if>
+            <if test="info.objectType != null and info.objectType != ''">
+                and t.object_type = #{info.objectType}
+            </if>
         </where>
     </select>
 
 
     <select id="queryEquipmentTree" resultMap="SysEquipmentListMap">
-        select t.* from sys_equipment t  WHERE t.parent_equipment_id = 0 order by t.code
+        select t.* from sys_equipment t  order by t.code
     </select>
 
     <select id="queryChildrenEquipById" resultMap="SysEquipmentListMap">