根据groupcode动态表单获取动态表单列

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java

@@ -72,7 +72,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     		List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
     		String appKey = RequestContext.getAppKey();
     		// 组装数据
-    		dynamicFormColumn.parallelStream().forEach(dynamicForm -> {
+    		dynamicFormColumn.stream().forEach(dynamicForm -> {
     			if (	dynamicForm.getFieldType().equals("input") || 
     					dynamicForm.getFieldType().equals("string") || 
     					dynamicForm.getFieldType().equals("datetime") || 
@@ -193,7 +193,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     			}
     		});
 
-    		return listForm.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
+    		return listForm.stream().sorted(Comparator.nullsFirst(Comparator.comparing(DynamicFormInitDto::getSort))).collect(Collectors.toList());
     	}
     	
     	public List<SelectItem> getdata(Collection<DataDictionary> list) {