设备列表

fys-system/src/main/resources/mapper/system/DeviceMapper.xml

@@ -24,12 +24,19 @@
         , device_type, customer_id, device_name, device_pic, device_mac, device_sn, remark, create_by, update_by, create_time, update_time
     </sql>
 
+    <sql id="device_Column_List">
+    d.id,
+    d.device_type, d.customer_id, d.device_name, d.device_pic, d.device_mac,
+    d.device_sn, d.remark, d.create_by, d.update_by, d.create_time, d.update_time,
+    d.binding_status, d.current_owner_id, d.original_owner_id, d.customer_name,
+    d.device_imei, d.longitude, d.latitude, d.tenant_id
+    </sql>
+
     <!-- 分页查询设备 -->
     <select id="findAll" resultType="com.fuyuanshen.modules.system.domain.Device">
         select
-        d.id, d.customer_id, d.customer_name, d.device_name,
-        d.device_pic, d.device_mac, d.device_sn, d.create_by, d.update_by,
-        d.create_time, d.update_time, d.device_type, d.remark, d.device_status, d.binding_status,t.type_name
+        <include refid="device_Column_List" />,
+        t.type_name as typeName
         from device d
         left join device_type t
         on d.device_type = t.id