From 218201cca77452c5366971580297c779af0d699f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 17 Nov 2025 16:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BB=BB=E5=8A=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AgvStationServiceImpl.java                   | 4 +++-
 .../modules/warehouse/service/impl/PalletServiceImpl.java     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvStationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvStationServiceImpl.java
index c98ca77..cb3874d 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvStationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvStationServiceImpl.java
@@ -11,10 +11,12 @@ import com.gaotao.modules.automatedWarehouse.entity.AgvStationData;
 import com.gaotao.modules.automatedWarehouse.entity.Area;
 import com.gaotao.modules.automatedWarehouse.mapper.AgvStationMapper;
 import com.gaotao.modules.automatedWarehouse.service.AgvStationService;
+import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.warehouse.entity.Location;
 import com.gaotao.modules.warehouse.dao.LocationMapper;
 import com.gaotao.modules.system.entity.SensitiveFieldChangeLog; // 新增 - rqrq
 import com.gaotao.modules.system.service.SensitiveFieldChangeLogService; // 新增 - rqrq
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -230,7 +232,7 @@ public class AgvStationServiceImpl extends ServiceImpl<AgvStationMapper, AgvStat
                     log.setFieldName("status_db");
                     log.setOldValue(oldStatusDb != null ? oldStatusDb + "(" + oldStatusDesc + ")" : "");
                     log.setNewValue(newStatusDb != null ? newStatusDb + "(" + newStatusDesc + ")" : "");
-                    log.setOperator("SYSTEM"); // 可根据实际情况从上下文获取 - rqrq
+                    log.setOperator(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername()); // 可根据实际情况从上下文获取 - rqrq
                     log.setOperationTime(new java.util.Date());
                     log.setRecordId(data.getId());
                     log.setOperationType("UPDATE");
diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/PalletServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/PalletServiceImpl.java
index c2b6d5f..c4e56ee 100644
--- a/src/main/java/com/gaotao/modules/warehouse/service/impl/PalletServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/PalletServiceImpl.java
@@ -8,6 +8,7 @@ import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.automatedWarehouse.entity.AgvStation;
 import com.gaotao.modules.automatedWarehouse.mapper.WcsIntegrationMapper;
+import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.trans.entity.TransNoControl;
 import com.gaotao.modules.trans.service.TransNoControlService;
 import com.gaotao.modules.warehouse.dao.PalletMapper;
@@ -18,6 +19,7 @@ import com.gaotao.modules.warehouse.entity.vo.PalletVo;
 import com.gaotao.modules.warehouse.service.PalletService;
 import com.gaotao.modules.system.entity.SensitiveFieldChangeLog; // 新增 - rqrq
 import com.gaotao.modules.system.service.SensitiveFieldChangeLogService; // 新增 - rqrq
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -173,7 +175,7 @@ public class PalletServiceImpl extends ServiceImpl<PalletMapper, Pallet> impleme
                     log.setFieldName("location_code");
                     log.setOldValue(oldLocationCode != null ? oldLocationCode : "");
                     log.setNewValue(newLocationCode != null ? newLocationCode : "");
-                    log.setOperator("SYSTEM"); // 可根据实际情况从上下文获取 - rqrq
+                    log.setOperator(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername()); // 可根据实际情况从上下文获取 - rqrq
                     log.setOperationTime(new Date());
                     log.setRecordId(palletData.getId());
                     log.setOperationType("UPDATE");