From 6bb9d197651f65205a585564ee8c364cea6736e6 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Thu, 3 Jul 2025 14:22:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/mapping/DeviceMapper.xml    | 4 ++--
 .../java/com/njcn/device/pq/mapper/mapping/LineMapper.xml | 8 ++++----
 .../device/pq/mapper/mapping/TerminalVersionMapper.xml    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
index 4f20b63e5..be3bb0199 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -169,7 +169,7 @@
         INNER JOIN sys_area area ON area.Id = areaId.NAME
         INNER JOIN pq_device device ON device.Id = dev.Id
         INNER JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
-        INNER JOIN sys_dict_data devT ON devT.Id = device.Dev_Type
+        INNER JOIN pq_dev_type devT ON devT.Id = device.Dev_Type
         WHERE dev.Id in
         <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
@@ -309,7 +309,7 @@
         INNER JOIN sys_area area ON area.Id = areaId.NAME
         INNER JOIN pq_device device ON device.Id = dev.Id
         left JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
-        left JOIN sys_dict_data devT ON devT.Id = device.Dev_Type
+        left JOIN pq_dev_type devT ON devT.Id = device.Dev_Type
         WHERE dev.Id in
         <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 2f7193088..71a1c0269 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -860,7 +860,7 @@
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        LEFT JOIN sys_dict_data e ON b.dev_type = e.id
+        LEFT JOIN pq_dev_type e ON b.dev_type = e.id
         where a.id in
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
@@ -894,7 +894,7 @@
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        LEFT JOIN sys_dict_data e ON b.dev_type = e.id
+        LEFT JOIN pq_dev_type e ON b.dev_type = e.id
         where a.id in
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
@@ -1012,7 +1012,7 @@
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        LEFT JOIN sys_dict_data e ON b.dev_type = e.id
+        LEFT JOIN pq_dev_type e ON b.dev_type = e.id
         where a.id in
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
@@ -1100,7 +1100,7 @@
                 left join sys_dict_data dic4 on de.Load_Type = dic4.id
                 left join sys_dict_data dic5 on de.Business_Type = dic5.id
                 left join sys_dict_data dic6 on d.Manufacturer = dic6.id
-                left join sys_dict_data dic7 on d.Dev_Type = dic7.id
+                left join pq_dev_type dic7 on d.Dev_Type = dic7.id
                 left join sys_dict_data dic8 on d.front_type = dic8.id
                 LEFT JOIN pq_node node ON d.Node_Id = node.id
         order by pj.sort,pro.sort,gd.sort,sub.sort,dev.sort,vol.sort,line.sort
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml
index 95fe88028..d821ae1e5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml
@@ -76,7 +76,7 @@
         sdd.Name AS devTypeName
         FROM cld_dev_version cdv
         LEFT JOIN pq_device pd ON cdv.Line_Id = pd.Id
-        LEFT JOIN sys_dict_data sdd ON pd.Dev_Type = sdd.Id
+        LEFT JOIN pq_dev_type sdd ON pd.Dev_Type = sdd.Id
         WHERE cdv.Line_Id = #{id}
     </select>
     <select id="selectDevVersion" resultType="com.njcn.device.pq.pojo.vo.TerminalVersionVO$Version">