|
@@ -18,10 +18,7 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import static com.boman.common.core.utils.obj.ObjectUtils.*;
|
|
|
import static com.boman.domain.constant.FormDataConstant.*;
|
|
@@ -49,11 +46,8 @@ public class HandlerFormDataUtils {
|
|
|
for (JSONObject jsonObject : result) {
|
|
|
//获取到所有rows查询字段的值
|
|
|
Set<String> strings = jsonObject.keySet();
|
|
|
-
|
|
|
- if ( strings.size() == 0){
|
|
|
- break;
|
|
|
- }
|
|
|
- for (String string : strings) {
|
|
|
+ List<String> arrays = new ArrayList<>(strings);
|
|
|
+ for (String string : arrays) {
|
|
|
for (GenTableColumn column : allColumns) {
|
|
|
String dictType = column.getDictType();
|
|
|
String columnName = column.getColumnName();
|