diff --git a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java index 6a80354..a3c585c 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java @@ -39,6 +39,13 @@ public class CategoryController { @Autowired private CategoryService categoryService; + @Operation(summary = "查询当前用户下所有的分类", description = "查询当前用户下所有的分类") + @GetMapping("noManage/getCategoryUserAllList") + public Mono>> getCategoryUserAllList(@RequestParam(required = false) Long userId) { + List voList = categoryService.getCategoryUserAllList(userId); + return Mono.just(Result.success(voList)); + } + @Operation(summary = "分页查询分类信息", description = "分页查询分类信息") @GetMapping("getCategoryList/{page}/{limit}") public Mono>> getCategoryList( @@ -65,13 +72,6 @@ public class CategoryController { return Mono.just(Result.success(pageResult)); } - @Operation(summary = "查询当前用户下所有的分类", description = "查询当前用户下所有的分类") - @GetMapping("noManage/getCategoryUserAllList") - public Mono>> getCategoryUserAllList() { - List voList = categoryService.getCategoryUserAllList(); - return Mono.just(Result.success(voList)); - } - @Operation(summary = "添加分类信息", description = "添加分类信息") @PostMapping("addCategory") public Mono> addCategory(@Valid @RequestBody CategoryAddDto dto) { diff --git a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java index 6ff00b7..8a65aaa 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java @@ -44,7 +44,7 @@ public interface CategoryService extends IService { * * @return 当前用户分类返回列表 */ - List getCategoryUserAllList(); + List getCategoryUserAllList(Long userId); /** * * 添加分类信息 diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java index 60ca105..b7fcb5e 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java @@ -90,9 +90,15 @@ public class CategoryServiceImpl extends ServiceImpl i * @return 当前用户分类返回列表 */ @Override - public List getCategoryUserAllList() { + public List getCategoryUserAllList(Long userId) { + // 判断用户ID是否为空,如果为空设置为当前的用户的ID + if (userId == null) { + userId = BaseContext.getUserId(); + } + + // 根据用户id返回父级列表 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Category::getUserId, BaseContext.getUserId()) + wrapper.eq(Category::getUserId, userId) .or() .eq(Category::getIsBuiltin, true); return list(wrapper)