dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(X-Pack): 修复数据填报提交数据包含必填时间范围时提示必填的问题

Browse Source
This commit is contained in:
ulleo 2024-05-30 17:27:00 +08:00
parent cf9e892992
commit 8e1fbfc082
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java
View File

@ -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