From c58ada7f49aac20b06ea2ebda2cb5c006decf122 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 10 五月 2024 17:01:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..b1243f2 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));
}
@@ -87,7 +87,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookings.setCreator(user.getId());
bookingsService.updateById(bookings);
return ApiResponse.success(null);
@@ -197,7 +197,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 +207,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