From a7e4d9c1f43e9009c0a94d350e49e58f9230d5b1 Mon Sep 17 00:00:00 2001
From: wangy <wangya_01@unisinsight.com>
Date: Thu, 21 May 2026 14:26:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip):bug=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/ShiroUtils.java     |  6 +++---
 .../impl/OmsPurchaseOrderServiceImpl.java      | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
index 80a348a5..5d84ff46 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
@@ -71,9 +71,9 @@ public class ShiroUtils {
         // 从数据库加载用户信息
         // 例如: select * from sys_user where user_id = ?
         SysUser user = new SysUser();
-        user.setUserId(101L);
-        user.setUserName("乐喽ch");
-        user.setLoginName("leoloch");
+        user.setUserId(103L);
+        user.setUserName("徐心钰");
+        user.setLoginName("15168396014");
         return user;
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
index b600527d..12f9ad67 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
@@ -84,13 +84,13 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
     @Value("${sip.nex.vendor-code:P100}")
     private String nexVendorCode;
 
-    @Value("${sip.nex.purchaser-username:xuxinyu}")
+    @Value("${sip.nex.purchaser-username:15168396014}")
     private String nexPurchaserUsername;
 
-    @Value("${sip.nex.owner-id:102}")
+    @Value("${sip.nex.owner-id:103}")
     private Long nexOwnerId;
 
-    @Value("${sip.nex.owner-name:叶宇豪}")
+    @Value("${sip.nex.owner-name:徐心钰}")
     private String nexOwnerName;
 
     @Value("${sip.nex.warehouse-id:3}")
@@ -151,9 +151,13 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
     @Override
     public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
     {
-        omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
-        omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
-
+        // 如果 ownerId 或 ownerName 为空，则使用当前登录用户
+        if (omsPurchaseOrder.getOwnerId() == null) {
+            omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
+        }
+        if (omsPurchaseOrder.getOwnerName() == null) {
+            omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
+        }
         omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
         omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
         // 设置初始版本号为 1
@@ -622,7 +626,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
         // 采购员：userName=徐心钰
         SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
         if(user == null){
-            user = userMapper.selectUserById(1L);
+            user = userMapper.selectUserById(103L);
         }
         omsPurchaseOrder.setPurchaserId(user.getUserId());
         omsPurchaseOrder.setPurchaserName(user.getUserName());