From cb5972493e140b26afef9edbe1eea6107c65a8d7 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期二, 15 十月 2024 17:58:33 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java index db9713f..17081dc 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java @@ -345,9 +345,10 @@ job_data.remove("success"); job_data.put("intakeId", intakeId); job_data.put("rtuAddr", rtuAddr); - job_data.put("vcNum", job_param.getString("icCardNo")); - job_data.put("orderNo", job_param.getString("orderNo")); - + if(job_param != null) { + job_data.put("vcNum", job_param.getString("icCardNo")); + job_data.put("orderNo", job_param.getString("orderNo")); + } response_CallBack = JSON.parseObject(job_response.toJSONString(), BaseResponse.class); } } -- Gitblit v1.8.0