Merge remote-tracking branch 'origin/master'

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

@@ -99,8 +99,12 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
                     List<String> arr = new ArrayList<>();
                     List<String> processRouteIds = Arrays.asList(technologyVo.getProcessRoute().split(","));
                     for (String processRouteId : processRouteIds) {
-                        ProductionProcesses productionProcesses = productionProcessesMap.get(processRouteId);
-                        arr.add(productionProcesses.getName());
+                        ProductionProcesses productionProcesses = productionProcessesMap.get(Long.parseLong(processRouteId));
+                        if(ObjectUtil.isNotEmpty(productionProcesses)) {
+                            arr.add(productionProcesses.getName());
+                        }else{
+                            arr.add("未知工序："+processRouteId);
+                        }
                     }
                     technologyVo.setProcessRouteNameList(arr);
                 }