修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java

@@ -32,7 +32,7 @@ public class DynamicFormInitDto implements Serializable{
     private Object defaultValue;
     
     @ApiModelProperty(value = "表单值")
-    private SelectItems data = new SelectItems();
+    private Object data ;
 
     @ApiModelProperty(value = "提交表单附加字段")
     private DynamicFormInstanceDto   formItemDescr;

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

@@ -8,6 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,17 +31,20 @@ import com.yeejoin.amos.boot.module.common.api.dto.SelectItems;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormColumnMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormColumnService;
+
 /**
-* 动态表单树形分组字段表服务实现类
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单树形分组字段表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Service
-public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnDto,DynamicFormColumn,DynamicFormColumnMapper> implements IDynamicFormColumnService {
+public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnDto, DynamicFormColumn, DynamicFormColumnMapper> implements IDynamicFormColumnService {
 
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
+
+
     /**
      * 分页查询
      */
@@ -51,7 +56,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
      * 列表查询 示例
      */
     public List<DynamicFormColumnDto> queryForDynamicFormColumnList() {
-                return this.queryForList("" , false);
+        return this.queryForList("", false);
     }
 
     public List<String> queryListByFormId(String groupCode) {
@@ -73,7 +78,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
         String appKey = RequestContext.getAppKey();
         // 组装数据
         dynamicFormColumn.stream().forEach(dynamicForm -> {
-    			if (	dynamicForm.getFieldType().equals("input") || 
+            if (dynamicForm.getFieldType().equals("input") ||
                     dynamicForm.getFieldType().equals("string") ||
                     dynamicForm.getFieldType().equals("datetime") ||
                     dynamicForm.getFieldType().equals("textarea") ||
@@ -99,6 +104,36 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
                 vo.setFormItemDescr(dynamicFormValue);
                 vo.setSort(dynamicFormValue.getSort());
                 listForm.add(vo);
+            } else if (dynamicForm.getFieldType().equals("treeSelect")) {
+                try {
+
+                DynamicFormInstanceDto dynamicFormValue = null;
+                JSONObject columnConfigJson = dynamicForm.getColumnConfig();
+                QueryWrapper<DataDictionary> queryWrappercolumnMap = new QueryWrapper<>();
+                queryWrappercolumnMap.eq("type", columnConfigJson.get("dict"));
+                queryWrappercolumnMap.orderByAsc("sort_num");
+                Collection<DataDictionary> list = iDataDictionaryService.list(queryWrappercolumnMap);
+
+                    List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
+                            , "getParent", null);
+                List<SelectItem> result = getdata(list);
+                    DynamicFormInitDto vo = new DynamicFormInitDto();
+                    vo.setKey(dynamicForm.getFieldCode());
+                    vo.setData(menus);
+                    vo.setLabel( dynamicForm.getFieldName());
+                    vo.setType(dynamicForm.getFieldType());
+                    vo.setColumnConfig(dynamicForm.getColumnConfig().toJSONString());
+                dynamicFormValue = new DynamicFormInstanceDto();
+                BeanUtils.copyProperties(dynamicForm, dynamicFormValue);
+                dynamicFormValue.setSequenceNbr(null);
+                dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
+                dynamicFormValue.setAppKey(appKey);
+                vo.setFormItemDescr(dynamicFormValue);
+                vo.setSort(dynamicFormValue.getSort());
+                listForm.add(vo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             } else {
                 // 查询数据项
                 DynamicFormInitDto vo = null;
@@ -184,7 +219,6 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
                         dynamicFormValue.setSequenceNbr(null);
                         dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
                         dynamicFormValue.setAppKey(appKey);
-	    				
                         vo.setFormItemDescr(dynamicFormValue);
                         vo.setSort(dynamicFormValue.getSort());
                         listForm.add(vo);