Browse Source

升级2.0.0

master
陈裕财 2 years ago
parent
commit
8ebf92cedc
  1. 4
      mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java
  2. 4
      mdp-form/src/main/java/com/mdp/form/service/FormDataService.java

4
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);
};

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

@ -81,8 +81,8 @@ public class FormDataService extends BaseService<FormDataMapper,FormData> {
List<String> pks=new ArrayList<>();
List<FormField> 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<String,Object> formDataMap= BaseUtils.toMap(formData);
FormField pk=pkFields.get(0);

Loading…
Cancel
Save