From 5efb25463fb6a6825ab8c85b880815af32d37515 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 11 五月 2024 16:38:06 +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 | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 63de0f6..3da88fb 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
@@ -2,11 +2,9 @@
import com.example.erp.common.Result;
import com.example.erp.service.userInfo.PermissionBasicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/permission")
@@ -17,13 +15,13 @@
this.permissionBasicService = permissionBasicService;
}
- @PostMapping("getPermission/{userId}")
- public Result getPermission(@PathVariable Integer userId){
- return Result.seccess(permissionBasicService.getPermission(userId));
+ @PostMapping("getPermission/{roleId}/{lang}")
+ public Result getPermission(@PathVariable Integer roleId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
+ return Result.seccess(permissionBasicService.getPermission(roleId,lang,selectPageId));
}
- @PostMapping("getPermissionList")
- public Result getPermission(){
- return Result.seccess(permissionBasicService.getPermissionList());
+ @PostMapping("getPermissionList/{lang}")
+ public Result getPermission(@PathVariable String lang){
+ return Result.seccess(permissionBasicService.getPermissionList(lang));
}
}
--
Gitblit v1.8.0