设备列表查询

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

@@ -5,7 +5,7 @@
         <id column="id" property="id"/>
         <result column="device_type" property="deviceType"/>
         <result column="customer_id" property="customerId"/>
-        <!--<result column="device_no" property="deviceNo"/>-->
+        <result column="device_no" property="deviceNo"/>
         <result column="device_name" property="deviceName"/>
         <result column="device_pic" property="devicePic"/>
         <result column="device_mac" property="deviceMac"/>
@@ -176,6 +176,9 @@
         from device d
                  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>
     </select>
 
     <!-- 获取分配设备的客户 -->