升级2.0.0

mdp-form/src/main/java/com/mdp/form/service/FormDataService.java

@@ -293,13 +293,16 @@ public class FormDataService extends BaseService<FormDataMapper,FormData> {
 		if(FormUtil.TASK_COMPLETED_FORM_DATA_UPDATE.equals(eventName) || FormUtil.TASK_COMPLETED.equals(eventName)) {
 			Map<String,Object> formDatasMap=( Map<String,Object>) flowVars.get("formData");
 
-			if(formDatasMap!=null) {
+			if(formDatasMap!=null && !formDatasMap.isEmpty()) {
 				FormDataVo formDataOrigin=BaseUtils.fromMap(formDatasMap, FormDataVo.class);
 				String fieldIds= (String) flowVars.get(FormUtil.NEED_UPDATE_FORM_DATA_FIELD_ID_LIST);
 				FormDefVo formDefVo=this.formFieldService.getFormFieldFromCache(formId);
 				boolean needUpdateBizKey=false;
 				Map<String,Object> needUpdateFormDataMap=new HashMap<>();
-				if(ObjectTools.isNotEmpty(fieldIds)) {
+				if(ObjectTools.isEmpty(fieldIds)||"all".equalsIgnoreCase(fieldIds)){
+					needUpdateFormDataMap.putAll(formDatasMap);
+				}else if(!"none".equalsIgnoreCase(fieldIds)) {
+
 					for (String fieldId : fieldIds.split(",")) {
 						Object value=formDatasMap.get(fieldId);
 						needUpdateFormDataMap.put(fieldId, value);
@@ -307,16 +310,16 @@ public class FormDataService extends BaseService<FormDataMapper,FormData> {
 							needUpdateBizKey=true;
 						}
 					}
-				}else{
-					needUpdateFormDataMap.putAll(formDatasMap);
 				}
+				if(!needUpdateFormDataMap.isEmpty()){
 					String bizKey=this.createBizKey(formDefVo.getFormFields(), formDataOrigin);
 					if(needUpdateBizKey){
 						needUpdateFormDataMap.put("bizKey", bizKey);
 					}
-				needUpdateFormDataMap.put("procInstId", procInstId);
 					this.updateSomeFieldsByFormDataId(needUpdateFormDataMap);
 				}
+
+			}
 		}else {
 
 			if("PROCESS_STARTED".equals(eventName)) {