问题处理

hx-mes/src/main/java/com/fjhx/mes/service/technology/impl/TechnologyServiceImpl.java

@@ -235,7 +235,7 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
             }
 //            //不包含结束节点才递归（防止死循环）
 //            if(!targetProcessesIds.contains(99L)) {
-//                processIds.addAll(recursionTechnologyProcessLine(technologyProcessLines, targetProcessesIds));
+                processIds.addAll(recursionTechnologyProcessLine(technologyProcessLines, targetProcessesIds));
 //            }
         }
         //去重

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderProductionProcessesServiceImpl.java

@@ -101,7 +101,9 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
                     if(json.getString("shape").equals("handle-btn") || json.getString("shape").equals("handle-btn-one")){
                         Long oldProductionId = json.getLong("productionId");
                         Long newProductionId = newOldIdMap.get(oldProductionId);
-                        json.put("productionId",newProductionId.toString());
+                        if(ObjectUtil.isNotEmpty(newProductionId)) {
+                            json.put("productionId", newProductionId.toString());
+                        }
                     }
                     newArray.add(json);
                 }