diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
index 792c1c0d..643e495b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
@@ -364,6 +364,9 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         jsonObject.put("measure", measure);
         recordTab.insert(jsonObject);
 
+        // 保存明细
+        this.submitRepair(whereJson);
+
         // 1.判断维修单明细中是否完成 都为是，不是则报错
         JSONArray reDtlArr = reDtlTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").getResultJSONArray(0);
         if (ObjectUtil.isEmpty(reDtlArr)) throw new BadRequestException("明细为空");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
index 3f3a386e..dbd0806a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
@@ -268,9 +268,12 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
 
         // 获取当前登陆用户
         Long currentUserId = SecurityUtils.getCurrentUserId();
-        String dept_str = deptService.getChildIdStr(currentUserId);
-        if (ObjectUtil.isNotEmpty(dept_str)) {
-            map.put("dept_str",dept_str);
+        JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonUser)) {
+            String dept_str = deptService.getChildIdStr(jsonUser.getLong("dept_id"));
+            if (ObjectUtil.isNotEmpty(dept_str)) {
+                map.put("dept_str",dept_str);
+            }
         }
 
         JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC");