From 74ed0e73c78c8f6332bbdc29b541437acb07b8f7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 07 五月 2024 16:14:53 +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/UserInfoController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
index 5255581..6045054 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
@@ -6,10 +6,7 @@
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/userInfo")
@@ -36,14 +33,18 @@
return Result.seccess(userService.isLogin()); }
@SaCheckLogin
- @PostMapping("/userAdd")
+ @PostMapping("/getTokenInfo")
public Result userAdd() {
return Result.seccess(StpUtil.getTokenInfo());
}
- @PostMapping("/userDelete")
- @SaCheckPermission("user.delete")
- public Result userDelete() {
- return Result.seccess(123123);
+ @PostMapping("/userDelete/{id}")
+ public Result userDelete(@PathVariable Integer id) {
+ return Result.seccess(userService.userDelete(id));
+ }
+
+ @GetMapping("findAll")
+ public Result findAll(){
+ return Result.seccess(userService.findAll());
}
}
--
Gitblit v1.8.0