WEB端查看APP客户设备绑定

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -167,18 +167,28 @@
 
     <select id="queryAppDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
         select d.id,
-               d.device_name,
-               d.device_mac,
-               d.device_sn,
-               d.device_imei,
-               d.device_mac,
-               dt.communication_mode
+        d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode
         from device d
-                 inner join device_type dt on d.device_type = dt.id
+        inner join device_type dt on d.device_type = dt.id
         where d.binding_user_id = #{criteria.bindingUserId}
         <if test="criteria.deviceType != null">
             and d.device_type = #{criteria.deviceType}
         </if>
+        <if test="criteria.deviceName != null">
+            and d.device_name = #{criteria.deviceName}
+        </if>
+        <if test="criteria.deviceMac != null">
+            and d.device_mac = #{criteria.deviceMac}
+        </if>
+        <if test="criteria.deviceImei != null">
+            and d.device_imei = #{criteria.deviceImei}
+        </if>
     </select>
 
     <!-- 获取分配设备的客户 -->