导入导出设备数据

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

@@ -49,8 +49,13 @@
             parameterType="com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria">
         SELECT dt.*, dg.id AS grant_id
         FROM device_type dt
-                 JOIN device_type_grants dg ON dt.id = dg.device_type_id
-        WHERE dt.type_name = #{criteria.typeName}
-          AND dg.customer_id = #{criteria.customerId}
+        JOIN device_type_grants dg ON dt.id = dg.device_type_id
+        <where>
+            dt.type_name = #{criteria.typeName}
+            <if test="criteria.customerId != null">
+                and dg.customer_id = #{criteria.customerId}
+            </if>
+        </where>
     </select>
+
 </mapper>