Browse Source

表单模块bug修复

dzx 7 months ago
parent
commit
8f2833682e

+ 2 - 0
src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -276,6 +276,8 @@ public class FormExecuteController {
                             dateTime = ((Date) value).toLocalDate().atStartOfDay();
                         } else if (value instanceof Timestamp) {
                             dateTime = ((Timestamp)value).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                        }else if(value instanceof LocalDateTime){
+                            dateTime = (LocalDateTime)value;
                         }
                         value = LocalDateTimeUtil.format(dateTime, format);
                     } else if ((StrUtil.equalsIgnoreCase(ComponentTypeConstant.TIME, componentType)

+ 1 - 1
src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -760,7 +760,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
                             //删除子表单数据
                             Entity childDeleteWhere = Entity.create(tableConfig.getTableName()).
                                     set(childTableConfig.get().getRelationField(), keyValues);
-                            Boolean result = SqlRunnerAdapter.db().dynamicDelete(tableName, childDeleteWhere);
+                            Boolean result = SqlRunnerAdapter.db().dynamicDelete(childTableConfig.get().getTableName(), childDeleteWhere);
                             if (!result) {
                                 throw new MyException("删除数据失败");
                             }