Merge remote-tracking branch 'origin/main'

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));
     }
 

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">