diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java
index f589a0cc..5415aecc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java
@@ -74,7 +74,7 @@ public class DevicefaultcaeServiceImpl implements DevicefaultcaeService {
             map.put("classIds", classIds);
         }
 
-        JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dept.name,file.device_code");
+        JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dept_name,device_code");
 /*        // 处理平均故障间隔时间 && 平均故障修复时间*/
         JSONArray content = json.getJSONArray("content");
         for (int i = 0; i < content.size(); i++) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql
index 216ca0b9..ae7193c6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql
@@ -55,8 +55,8 @@
                 MAX(file.device_code) AS device_code,
                 MAX(file.device_model) AS device_model,
                 re.devicerecord_id,
-                file.device_name,
-                file.extend_code
+                MAX( file.device_name ) AS device_name,
+                MAX( file.extend_code ) AS extend_code
             FROM
             	EM_BI_DeviceRepairRequest re
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id
@@ -90,6 +90,7 @@
                 OPTION 输入.end_time <> ""
                     re.fault_time <= 输入.end_time
                 ENDOPTION
+                GROUP BY re.devicerecord_id
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
index b7de655c..a8537f05 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
@@ -142,12 +142,6 @@ export default {
       user: 'user'
     })
   },
-  created() {
-    this.getDepts()
-    this.query.use_id = this.user.dept.id
-    this.getSupDepts(this.user.dept.id)
-    this.crud.toQuery()
-  },
   methods: {
     clickChange(item) {
       this.tableRadio = item
@@ -175,7 +169,10 @@ export default {
       this.$refs.table.clearSelection()
     },
     open() {
-      this.crud.resetQuery(true)
+      this.getDepts()
+      this.query.use_id = this.user.dept.id
+      this.getSupDepts(this.user.dept.id)
+      this.crud.toQuery()
     },
     close() {
       this.crud.resetQuery(false)