分配客户

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

@@ -77,11 +77,12 @@
         select
         da.id AS id,d.device_name,
         d.device_pic, d.device_mac, d.device_sn, d.update_by,d.device_imei,
-        d.update_time, d.device_type, d.remark, d.binding_status,d.type_name AS typeName,
+        d.update_time, dg.id AS device_type, d.remark, d.binding_status,d.type_name AS typeName,
         da.assignee_id AS customerId, da.assignee_name AS customerName, da.active AS deviceStatus,
         da.create_time AS create_time , da.assigner_name AS createByName , da.id AS assignId
         from device d
         LEFT JOIN device_type t ON d.device_type = t.id
+        LEFT JOIN device_type_grants dg ON dg.device_type_id = t.id
         LEFT JOIN device_assignments da ON da.device_id = d.id
         <where>
             <!-- 时间范围等其他条件保持原样 -->