bug解决

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -667,7 +667,8 @@
         A4.`Name` subName,
         C3.`Name` subScale,
         A5.`Name` cityCompany,
-        F.`Name` provinceCompany
+        F.`Name` provinceCompany,
+        dev.Manufacturer
         FROM
         pq_line A1,
         pq_line A2,
@@ -676,6 +677,7 @@
         pq_line A5,
         pq_line A6,
         pq_voltage B,
+        pq_device dev,
         sys_dict_data C1,
         sys_dict_data C2,
         sys_dict_data C3,
@@ -689,7 +691,7 @@
         </foreach>
         AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
         AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
-        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code
+        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
     </select>
 
     <select id="getDeviceStatus" resultType="LineStateVO">