--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/diytype/DiyTypeController.java

@@ -315,9 +315,11 @@ public class DiyTypeController {
 		pageParam.setOrderBy("sort");
 		service.createCriteria().andEqualTo("status", 1);
 		List<DiyType> list = service.queryByDiytypelId(ids);
-		// 获取一级分类
-		List<DiyTypeVO> voList = Copy.copyList(list , DiyTypeVO.class, obj -> obj.getParentId().equals("0"));
-		tree(list,voList);
+		List<DiyTypeVO> voList =new ArrayList<DiyTypeVO>();
+		for(DiyType dt : list) {
+			List<DiyTypeVO> subList = tree(dt.getTypeName()).getData();
+			voList.addAll(subList);
+		}
 		return CallBack.success(voList);
 		/*return CallBack.success(service.queryByResourceType(resourceType));*/
 	}