From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
index 2974de9..21e9123 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
@@ -6,6 +6,7 @@
import com.ruoyi.domain.ZAuthority;
import com.ruoyi.domain.dto.AuthorityDto;
import com.ruoyi.domain.dto.AuthorityDto2;
+import com.ruoyi.domain.dto.EmpowerDto;
import com.ruoyi.service.ZAuthorityService;
import org.springframework.web.bind.annotation.*;
@@ -64,13 +65,27 @@
return zAuthorityService.getOtherAuthority(authorityDto);
}
-// /**
-// * 鎺堟潈(鍙湁瀹跺涵绠＄悊鍛樻墠鑳借皟鐢ㄨ繖涓帴鍙�)
-// */
-// @PostMapping("/empower")
-// public AjaxResult empower(){
-//
-// }
+ /**
+ * 鎺堟潈(鍙湁瀹跺涵绠＄悊鍛樻墠鑳借皟鐢ㄨ繖涓帴鍙�)
+ */
+ @PostMapping("/empower")
+ public AjaxResult empower(@RequestBody EmpowerDto zAuthority){
+ return zAuthorityService.saveZa(zAuthority);
+ }
+ /**
+ * 鏍规嵁authorityId鍜屽搴璱d鏌ョ湅宸茬粡鎺堟潈缁欓偅浜涗汉
+ */
+ @PostMapping("/getInfoByAidFid")
+ public AjaxResult empowerGetInfo(@RequestBody ZAuthority zAuthority){
+ return zAuthorityService.listByFidAid(zAuthority);
+ }
+ /**
+ * 鏍规嵁authorityId鍜屽搴璱d鏀跺洖宸茬粡鎺堟潈缁欓偅浜涗汉
+ */
+ @PostMapping("/deleteInfoByAidFid")
+ public AjaxResult deleteEmpower(@RequestBody EmpowerDto zAuthority){
+ return zAuthorityService.deleteZa(zAuthority);
+ }
--
Gitblit v1.9.1