dzx 1 år sedan
förälder
incheckning
da64d7ebf6

+ 4 - 2
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -385,8 +385,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             if(formInfoVo.getFormData().containsKey("document_level") && formInfoVo.getFormData().containsKey("emergency_level")){
                 Object id = formInfoVo.getFormData().get("id");
                 OfficialDocumentReceived received = officialdocumentreceivedmapper.selectById(id.toString());
-                formInfoVo.getFormData().put("document_level", received.getDocumentLevel());
-                formInfoVo.getFormData().put("emergency_level", received.getEmergencyLevel());
+                if(received != null){
+                    formInfoVo.getFormData().computeIfAbsent("document_level", k -> received.getDocumentLevel());
+                    formInfoVo.getFormData().computeIfAbsent("emergency_level", k -> received.getEmergencyLevel());
+                }
             }
             formInfoVos.add(formInfoVo);
         }