From a11d3637d38d2958877de47dacabfe9d3b34031e Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Fri, 12 Jul 2024 09:23:30 +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

---
 .../das/modules/equipment/controller/EquipmentController.java | 4 ----
 das/src/main/resources/mapper/SysEquipmentMapper.xml          | 2 +-
 2 files changed, 1 insertion(+), 5 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 97c17ce4..a7a05c1d 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
@@ -56,10 +56,6 @@ public class EquipmentController {
         if(!hasPermission){
             return R.fail("没有设备管理权限");
         }
-
-        if (sysEquipmentDto.getOrgId() == null) {
-            throw new ServiceException("参数缺失");
-        }
         return R.success(sysEquipmentService.creatSysEquipment(sysEquipmentDto));
     }
 
diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index 1ef9bad3..f5cab4ee 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -80,7 +80,7 @@
 
 
     <select id="queryEquipmentTree" resultMap="SysEquipmentListMap">
-        select t.* from sys_equipment t  order by t.code
+        select t.* from sys_equipment t where  t.parent_equipment_id is null or t.parent_equipment_id = 0 order by t.code
     </select>
 
     <select id="queryChildrenEquipById" resultMap="SysEquipmentListMap">