From 4a6551adeb111eeb7b7d6a6f665286c9b512d3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 18 Sep 2023 13:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mdp/form/service/FormDefService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
index d6b5158..e623bc5 100644
--- a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
@@ -3,6 +3,7 @@ package com.mdp.form.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mdp.core.utils.ObjectTools;
 import com.mdp.form.entity.FormDefVo;
 import com.mdp.form.entity.FormField;
 import com.mdp.safe.client.entity.User;
@@ -89,7 +90,7 @@ public class FormDefService extends BaseService<FormDefMapper,FormDef> {
 	public void addFormDefAndFields(FormDefVo formDefVo) {
 		User user= LoginUtils.getCurrentUserInfo();
 		FormDef formDef=formDefVo.getFormDef();
-		String formId= this.createKey("id");
+		String formId= ObjectTools.isEmpty(formDef.getId())?this.createKey("id"):formDef.getId();
 		formDef.setId(formId);
 		formDef.setCtime(new Date());
 		formDef.setUserid(user.getUserid());