From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 a0ad216..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.*;
@@ -43,7 +44,7 @@
/**
* 鏍规嵁鏉′欢鏌ョ湅鏉冮檺
*/
- @GetMapping("/condition")
+ @PostMapping("/condition")
public AjaxResult getAuthorityByCondition(@RequestBody AuthorityDto authorityDto){
return AjaxResult.success(zAuthorityService.getByCondition(authorityDto));
}
@@ -56,13 +57,35 @@
return zAuthorityService.managerAuthority(authorityDto);
}
-// /**
-// * 鎺堟潈(鍙湁瀹跺涵绠＄悊鍛樻墠鑳借皟鐢ㄨ繖涓帴鍙�)
-// */
-// @PostMapping("/empower")
-// public AjaxResult empower(){
-//
-// }
+ /**
+ * 鏌ョ湅鍏朵粬浜虹幇鏈夌殑鏉冮檺
+ */
+ @PostMapping("/list/other")
+ public AjaxResult getOtherAuthority(@RequestBody AuthorityDto authorityDto){
+ return zAuthorityService.getOtherAuthority(authorityDto);
+ }
+
+ /**
+ * 鎺堟潈(鍙湁瀹跺涵绠＄悊鍛樻墠鑳借皟鐢ㄨ繖涓帴鍙�)
+ */
+ @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