From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:39:32 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 0b54298..b4fcbb8 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
@@ -57,7 +57,7 @@
@PostMapping("/create")
@RequiresPermissions("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookings.setCreator(user.getId());
return ApiResponse.success(bookingsService.create(bookings));
}
@@ -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 = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bookings.setCreator(user.getId());
+ bookings.setLoginUserInfo(getLoginUser(null));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
@@ -107,12 +106,12 @@
ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:bookings:query")
- public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
- return ApiResponse.success(bookingsService.getMeetingDetail(id));
- }
+// @ApiOperation("鏍规嵁ID鏌ヨ")
+// @GetMapping("/{id}")
+// @RequiresPermissions("business:bookings:query")
+// public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
+// return ApiResponse.success(bookingsService.getMeetingDetail(id));
+// }
@ApiOperation("鍙栨秷")
@@ -197,7 +196,7 @@
startTime = DateUtil.getMonday();
endTime = DateUtil.getSunday();
}
- return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser().getId(), null,startTime,endTime));
+ return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser(null).getId(), null,startTime,endTime));
}
/**
@@ -207,8 +206,6 @@
@ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
@PostMapping("/findMothBookingMeet")
public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){
-
-
- return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser().getId(),roomId,dateMonth));
+ return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(null).getId(),roomId,dateMonth));
}
}
--
Gitblit v1.9.3