From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 4b85ab9..0adad18 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
@@ -10,6 +10,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+
@RestController
@Api(value="鐢ㄦ埛controller",tags={"鐢ㄦ埛鎿嶄綔鎺ュ彛"})
@RequestMapping("/userInfo")
@@ -47,7 +49,7 @@
}
- @SaCheckPermission("userList.search")
+ @SaCheckPermission("userList.delete")
@ApiOperation("鍒犻櫎鐢ㄦ埛")
@PostMapping("/userDelete/{id}")
public Result userDelete(@PathVariable Integer id) {
@@ -61,4 +63,24 @@
public Result findAll(){
return Result.seccess(userService.findAll());
}
+
+ @ApiOperation("app鏌ヨ鎶ュ伐鐝粍鍒楄〃")
+ @PostMapping("findByAddress")
+ public Result findByAddress(@RequestBody Map<String,String> userName){
+ return Result.seccess(userService.findByAddress(userName));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+ @SaCheckPermission("userList.search")
+ @PostMapping("selectProcess")
+ public Result selectProcess(){
+ return Result.seccess(userService.selectProcessSv());
+ }
+
+ @ApiOperation("淇敼鐢ㄦ埛宸ュ簭")
+ @SaCheckPermission("userList.search")
+ @PostMapping("updateProcess/{id}/{process}")
+ public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
+ return Result.seccess(userService.updateProcessSv(id,process));
+ }
}
--
Gitblit v1.8.0