From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
index c67a92d..ff4e171 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
@@ -15,13 +15,13 @@
this.permissionBasicService = permissionBasicService;
}
- @PostMapping("getPermission/{userId}/{lang}")
- public Result getPermission(@PathVariable Integer userId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
- return Result.seccess(permissionBasicService.getPermission(userId,lang,selectPageId));
+ @PostMapping("getPermission/{roleId}/{lang}")
+ public Result getPermission(@PathVariable Integer roleId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
+ return Result.success(permissionBasicService.getPermission(roleId,lang,selectPageId));
}
@PostMapping("getPermissionList/{lang}")
public Result getPermission(@PathVariable String lang){
- return Result.seccess(permissionBasicService.getPermissionList(lang));
+ return Result.success(permissionBasicService.getPermissionList(lang));
}
}
--
Gitblit v1.8.0