From 39e16dc87c7b55b0d202bbd5416a478075dc236d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 09:09:43 +0800
Subject: [PATCH] #修复 1. 列表行点击与button冲突问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index ddeb48c..c0d588d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -145,6 +145,7 @@
@ApiOperation("缁勬嫋")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+ Long userId = getLoginUserId();
if (Objects.isNull(waitPakin)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -154,7 +155,7 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
- return R.ok(mobileService.mergeItems(waitPakin));
+ return R.ok(mobileService.mergeItems(waitPakin, userId));
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
--
Gitblit v1.9.1