From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index b1243f2..c4552b2 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -66,7 +66,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:bookings:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- bookingsService.deleteById(id);
+ bookingsService.deleteById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -79,7 +79,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- bookingsService.deleteByIdInBatch(idList);
+ bookingsService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -87,8 +87,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = getLoginUser(null);
- bookings.setCreator(user.getId());
+ bookings.setLoginUserInfo(getLoginUser(null));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3