From 8e1fbfc08245001662810347aae52af9072b8950 Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 30 May 2024 17:27:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=BF=85=E5=A1=AB=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=97=B6=E6=8F=90=E7=A4=BA=E5=BF=85=E5=A1=AB=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/datafill/DataFillDataService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java index cf449ee748..2634078592 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java @@ -477,10 +477,18 @@ public class DataFillDataService { } String name = field.getSettings().getMapping().getColumnName(); - if (data.get(name) == null) { + if (!StringUtils.equalsIgnoreCase(field.getType(), "dateRange") && data.get(name) == null) { if (field.getSettings().isRequired()) { DataEaseException.throwException("[" + field.getSettings().getName() + "] 不能为空"); } + } else if (StringUtils.equalsIgnoreCase(field.getType(), "dateRange")) { + if (field.getSettings().isRequired()) { + String name1 = field.getSettings().getMapping().getColumnName1(); + String name2 = field.getSettings().getMapping().getColumnName2(); + if (data.get(name1) == null || data.get(name2) == null) { + DataEaseException.throwException("[" + field.getSettings().getName() + "] 不能为空"); + } + } } if (StringUtils.equalsIgnoreCase(field.getType(), "input")) { //input框支持unique