From c983d4642b2aeeceb6442badaebd1b7bab7943eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 二月 2024 16:52:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index 1a7bb53..0aadef7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -12,7 +12,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.Arrays;
/**
* Created by vincent on 2/13/2024
@@ -25,7 +25,6 @@
private RoleService roleService;
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@PostMapping("/role/page")
public R page(@RequestBody BaseParam param) {
PageParam<Role, BaseParam> page = new PageParam<>(param);
@@ -33,14 +32,12 @@
}
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@PostMapping("/role/list")
public R list(@RequestBody BaseParam param) {
return R.ok().add(roleService.list());
}
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@GetMapping("/role/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(roleService.getById(id));
@@ -58,10 +55,10 @@
&& roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getCode, role.getCode())) > 0) {
return R.error("瑙掕壊鏍囪瘑宸插瓨鍦�");
}
- if (roleService.save(role)) {
- return R.ok("娣诲姞鎴愬姛");
+ if (!roleService.save(role)) {
+ return R.error("娣诲姞澶辫触");
}
- return R.error("娣诲姞澶辫触");
+ return R.ok("娣诲姞鎴愬姛");
}
@PreAuthorize("hasAuthority('sys:role:update')")
@@ -78,21 +75,26 @@
.ne(Role::getId, role.getId())) > 0) {
return R.error("瑙掕壊鍚嶇О宸插瓨鍦�");
}
- if (roleService.updateById(role)) {
- return R.ok("淇敼鎴愬姛");
+ if (!roleService.updateById(role)) {
+ return R.error("淇敼澶辫触");
}
- return R.error("淇敼澶辫触");
+ return R.ok("淇敼鎴愬姛");
}
@PreAuthorize("hasAuthority('sys:role:remove')")
@OperationLog("鍒犻櫎瑙掕壊")
- @PostMapping("/role/remove")
- public R remove(@RequestBody List<Long> ids) {
- if (roleService.removeByIds(ids)) {
- return R.ok("鍒犻櫎鎴愬姛");
+ @PostMapping("/role/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!roleService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
}
- return R.error("鍒犻櫎澶辫触");
+ return R.ok("鍒犻櫎鎴愬姛");
}
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @PostMapping("/role/export")
+ public R export(@RequestBody Role role) {
+ return R.ok("瀵煎嚭鎴愬姛");
+ }
}
--
Gitblit v1.9.1