From 8ebf92cedcba266e1f10179f3ba31d896363decc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 18 Sep 2023 13:48:26 +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/ctrl/FormDataController.java | 4 ++-- .../src/main/java/com/mdp/form/service/FormDataService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java index d745d74..caaf226 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java @@ -180,7 +180,7 @@ public class FormDataController { } } String bizKey=formDataService.createBizKey(formFields,formData); - if(formDataService.count(QueryTools.initQueryWrapper(FormData.class).eq("biz_key",bizKey).eq("form_id",formData.getFormId()))>0){ + 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.setBizKey(bizKey); @@ -243,7 +243,7 @@ public class FormDataController { String bizKey= formDataService.createBizKey(formFields,formData); formData.setBizKey(bizKey); - if(!bizKey.equals(formDataDb.getBizKey())){ + 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); }; diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java index fe102de..d51b217 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java @@ -81,8 +81,8 @@ public class FormDataService extends BaseService { List pks=new ArrayList<>(); List pkFields=formFields.stream().filter(k->k.getIsBizKey().endsWith("1")).collect(Collectors.toList()); - if(pkFields==null || pkFields.size()==0){ - throw new BizException("pkfields-0","表单主键不存在，请设置表单主键"); + if(pkFields==null || pkFields.size()==0){//没有业务主键，则取id + return ""; } Map formDataMap= BaseUtils.toMap(formData); FormField pk=pkFields.get(0);