From ed722acfaf6f10ba2e6c3e1b4d68a2552bdde245 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 16:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 28371f7..21f31b3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -55,8 +55,7 @@
WorkAssignmentMapper workAssignmentMapper;
- // private final static String ERP_URL = "http://192.168.2.100:8086";
- private final static String ERP_URL = "http://10.153.19.174:8086";
+ private final static String ERP_URL = "http://192.168.2.100:8086";
/**
@@ -366,10 +365,12 @@
result.put("title", reportingWorkJson);
result.put("type", 0);
- if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
- result.put("isPatch", 1);
- } else {
- result.put("isPatch", 0);
+ if (reportingWorkDetails.get(0).getDamageDetails() != null) {
+ if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
+ result.put("isPatch", 1);
+ } else {
+ result.put("isPatch", 0);
+ }
}
result.put("userId", "admin");
result.put("userName", "admin");
--
Gitblit v1.8.0