소스 검색

刀具同步问题修改

yejian 3 년 전
부모
커밋
cd1dceae1f

+ 4 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MachineCuttingToolServiceImpl.java

@@ -112,8 +112,10 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                 MachineCuttingTool machineCuttingTool = new MachineCuttingTool();
                 machineCuttingTool.setMachineId(resourceId);
                 machineCuttingTool.setCuttingToolName(name);
-                machineCuttingTool.setCuttingToolPicture(cuttingTool.getCuttingToolPicture());
-                machineCuttingTool.setCuttingToolInstallPicture(cuttingTool.getCuttingToolInstallPicture());
+                if(null != cuttingTool){
+                    machineCuttingTool.setCuttingToolPicture(cuttingTool.getCuttingToolPicture());
+                    machineCuttingTool.setCuttingToolInstallPicture(cuttingTool.getCuttingToolInstallPicture());
+                }
                 machineCuttingTool.setCuttingToolPosition(tool.getString("toolPosition"));
                 machineCuttingTool.setCuttingToolId(tool.getString("toolNo"));
                 String cuttingToolType = tool.getString("monitorType");