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 @@ and t.code like concat('%',#{info.code},'%') + + and t.object_type = #{info.objectType} +