--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/diytype/FgDiyTypeController.java

@@ -65,12 +65,12 @@ public class FgDiyTypeController {
 	
 	@ApiOperation(value = "获取一级分类的二级分类", notes = "获取一级分类的二级分类")
 	@GetMapping(value = "/secondLevel/list")
-	public CallBack<List<DiyType>> getDiyTypeByName(Integer diyTypeId, Integer num) {
-		if(diyTypeId == null){
+	public CallBack<List<DiyType>> getDiyTypeByName(String name, Integer num) {
+		if(StringUtils.isBlank(name)){
 			throw new BaseException(ResponseCodeEnum.MISS_EXCEPTION.getCode(), "参数不能为空！");
 		}
 		DiyType dt = new DiyType();
-		dt.setId(diyTypeId);
+		dt.setTypeName(name);
 		dt = service.selectOne(dt);
 		Example example = service.createExample();
 		example.createCriteria().andEqualTo("parentId", dt.getId()).andEqualTo("status", DiyTypeStatusEnum.STATUS_1.getCode());
@@ -83,6 +83,23 @@ public class FgDiyTypeController {
 		return CallBack.success(list);
 	}
 	
+	@ApiOperation(value = "根据当前id查询下级分类", notes = "根据当前id查询下级分类\"")
+	@GetMapping(value = "/secondLevel/list")
+	public CallBack<List<DiyType>> getDiyTypeByName(Integer id, Integer num) {
+		if(id == null){
+			throw new BaseException(ResponseCodeEnum.MISS_EXCEPTION.getCode(), "参数不能为空！");
+		}
+		Example example = service.createExample();
+		example.createCriteria().andEqualTo("parentId", id).andEqualTo("status", DiyTypeStatusEnum.STATUS_1.getCode());
+		if(num == null){
+			PageHelper.orderBy("sort desc,uploadTime desc");
+		} else {
+			PageHelper.startPage(1, num, "sort desc,uploadTime desc");
+		}
+		List<DiyType> list = service.selectByExample(example);
+		return CallBack.success(list);
+	}
+	
 	@ApiOperation(value = "查询全部自定义分类tree", notes = "查询列表")
 	@GetMapping(value = "/tree")
 	public CallBack<List<FgDiyTypeVo>> tree() {