From 8304fc43850daba13cfbec989e554d720ab62ca4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
index fdfcacd..a7e6f9f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
@@ -97,7 +97,7 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鐢ㄦ埛")
@GetMapping("/selectPage")
- @RequiresRoles({"admin"})
+// @RequiresRoles({"admin"})
@RequiresPermissions({"user:select"})
public Result selectPage(UserVo userVO) {
return Result.success(userService.selectPage(userVO));
@@ -108,7 +108,7 @@
@RequiresRoles({"admin"})
@RequiresPermissions({"user:update", "user:add"})
public Result saveOrUpdate(@RequestBody User user) {
- if ("admin".equals(user.getUsername())) {
+ if ("admin".equals(user.getUsername()) && user.getState() == 0) {
return Result.fail("绠＄悊鍛樹笉鍙互琚鐢�");
}
Integer count = userService.lambdaQuery()
@@ -167,4 +167,13 @@
private class UpdatePasswordRequest {
}
+
+
+
+
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0