From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index 4d19e88..0e86e97 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -87,7 +87,6 @@
@GetMapping("/detail")
public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token)));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
@@ -123,7 +122,6 @@
@PostMapping("/passOn")
public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.passOn(passOnDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -142,7 +140,6 @@
@GetMapping("/urge")
public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
@@ -157,9 +154,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
@PostMapping("/sendCopy")
- public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
+ public ApiResponse sendCopy(@RequestBody SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.sendCopy(sendCopyDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3