diff --git a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java index ef2c70c..524b4c0 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java @@ -124,7 +124,7 @@ public class AssignController { ctx.getUserId(), now, ctx.getClientIp(), - UploadContentDto.from(file) + UploadContentDto.from(file, ctx.getUserId()) ); return result; } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java b/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java index 1ff246c..1a6a4f8 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java @@ -89,7 +89,7 @@ public class PerformanceController { ExcelUploadResultDto result = performanceService.createPerformancesFromExcel(file, regId, now); - systemEventLogService.writeUploadPerformanceLog(regId, now, clientIp, UploadContentDto.from(file)); + systemEventLogService.writeUploadPerformanceLog(regId, now, clientIp, UploadContentDto.from(file, regId)); return result; } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java index 5e51539..fcf793c 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java @@ -65,18 +65,21 @@ public class ReviewController { public PerformanceReviewDto uploadReviewFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, + @RequestParam(required = false) String paramUserId, @RequestParam("file") MultipartFile file, RequestUserContext ctx ) { LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - PerformanceReviewDto result = reviewService.uploadReviewFile(performanceId, reviewType, file, ctx.getUserId(), now); + String userId = paramUserId != null ? paramUserId : ctx.getUserId(); + + PerformanceReviewDto result = reviewService.uploadReviewFile(performanceId, reviewType, file, userId, now); systemEventLogService.writeUploadReviewFileLog( ctx.getUserId(), now, ctx.getClientIp(), performanceId, reviewType, - UploadContentDto.from(file) + UploadContentDto.from(file, userId) ); return result; } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/UserController.java b/src/main/java/com/kri/gwcf/review/back/controller/UserController.java index 1c9a0a3..be1da09 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/UserController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/UserController.java @@ -86,7 +86,7 @@ public class UserController { ExcelUploadResultDto result = userService.createUsersFromExcel(userRole, file, regId, now); - systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file)); + systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file, regId)); return result; } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/systemlog/UploadContentDto.java b/src/main/java/com/kri/gwcf/review/back/dto/systemlog/UploadContentDto.java index 624d8b3..1e34c18 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/systemlog/UploadContentDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/systemlog/UploadContentDto.java @@ -16,12 +16,14 @@ public class UploadContentDto { String fileName; String fileType; Long fileSize; + String uploadUserId; - public static UploadContentDto from(MultipartFile file){ + public static UploadContentDto from(MultipartFile file, String uploadUserId){ return UploadContentDto.builder() .fileName(file.getOriginalFilename()) .fileType(file.getContentType()) .fileSize(file.getSize()) + .uploadUserId(uploadUserId) .build(); } }