设备列表查询问题

gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java

@@ -51,9 +51,9 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
         List<TDeviceInfo> deviceInfoList = tDeviceInfoMapper.selectTDeviceInfoList(tDeviceInfo);
 
         if(deviceInfoList.size() != 0){
-            DeviceInfoVo deviceInfoVo = new DeviceInfoVo();
 
             for(TDeviceInfo device : deviceInfoList){
+                DeviceInfoVo deviceInfoVo = new DeviceInfoVo();
                 BeanUtils.copyProperties(device, deviceInfoVo);
 
                 TPipe pipe = tPipeMapper.selectTPipeById(device.getPipeId());

gassafety-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -34,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             is_del = '0'
             <if test="enterpriseId != null and enterpriseId != 0 "> and enterprise_id = #{enterpriseId}</if>
-            <if test="pipeId != null "> and pipe_id = #{pipeId}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceCode != null  and deviceCode != ''"> and device_code like concat('%', #{deviceCode}, '%')</if>
             <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>