From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
index b0c17b6..db594ed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.vos.MenuVO;
@@ -20,7 +21,7 @@
**/
@RestController
@RequestMapping("/role/")
-public class RoleApi {
+public class RoleApi extends BaseController {
@Resource
private RoleService roleService;
@@ -66,8 +67,8 @@
* @return 角色集合
*/
@PostMapping("listrolebackstage")
- public R listRoleBackstage(@RequestParam("communityId") Long communityId) {
- return roleService.listRoleBackstage(communityId);
+ public R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode) {
+ return roleService.listRoleBackstage(communityId,pageNum,pageSize,areaCode);
}
/**
@@ -103,7 +104,7 @@
*/
@PostMapping("listmenubackstage")
public R listMenuBackstage(@RequestParam("communityId") Long communityId) {
- return roleService.listMenuBackstage(communityId);
+ return roleService.listMenuBackstage(communityId,this.getAppId());
}
/**
--
Gitblit v1.7.1