升级2.0.0

mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java

@@ -160,6 +160,7 @@ public class FormDataController {
 
 		User user=LoginUtils.getCurrentUserInfo();
 		formData.setUserid(user.getUserid());
+		formData.setBranchId(user.getBranchId());
 		formData.setCuserid(user.getUserid());
 		formData.setCusername(user.getUsername());
 		formData.setDeptid(user.getDeptid());
@@ -183,6 +184,7 @@ public class FormDataController {
 		if(ObjectTools.isNotEmpty(bizKey) && formDataService.count(QueryTools.initQueryWrapper(FormData.class).eq("biz_key",bizKey).eq("form_id",formData.getFormId()))>0){
 			return Result.error("biz-key-exists","%s已存在",bizKey);
 		};
+		formData.setId(formDataService.createKey("id"));
 		formData.setBizKey(ObjectTools.isNotEmpty(bizKey)?bizKey:formData.getId());
 		formDataService.save(formData);
          return Result.ok("add-ok","添加成功！");
@@ -242,7 +244,7 @@ public class FormDataController {
 		}
 
 		String bizKey= formDataService.createBizKey(formFields,formData);
-		formData.setBizKey(ObjectTools.isNotEmpty(bizKey)?bizKey:formData.getId());
+		formData.setBizKey(ObjectTools.isNotEmpty(bizKey)?bizKey:formDataDb.getId());
 		if(ObjectTools.isNotEmpty(bizKey) && !bizKey.equals(formDataDb.getBizKey())){
 			if(formDataService.count(QueryTools.initQueryWrapper(FormData.class).eq("biz_key",bizKey).eq("form_id",formData.getFormId()))>0){
 				return Result.error("biz-key-exists","%s已存在",bizKey);