From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index ab10daa..472321a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -82,6 +82,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
@@ -351,9 +352,9 @@
.in(TSamplingRecordOperation::getId, ids));
for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
samplingRecordOperation.setStatus(3);
- samplingRecordOperation.setSendPersonId(userId);
- samplingRecordOperation.setSendSign(samplingRecordOperation.getReceiptsSign());
- samplingRecordOperation.setSendTime(LocalDateTime.now());
+ samplingRecordOperation.setReceiptsPersonId(userId);
+ samplingRecordOperation.setReceiptsSign(samplingRecordOperation.getReceiptsSign());
+ samplingRecordOperation.setReceiptsTime(LocalDateTime.now());
}
samplingRecordOperationService.updateBatchById(samplingRecordOperations);
return R.ok();
--
Gitblit v1.7.1