From 50a32c176d43a1471d9b21e92fe2dacf79496783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 3 Mar 2026 16:30:38 +0800 Subject: [PATCH] =?UTF-8?q?WMS=E7=A7=BB=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86=E3=80=81=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E7=AE=A1=E7=90=86=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=A7=93=E5=90=8D=EF=BC=8C=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E5=AD=98=E8=B4=A6=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ShiftManageDomainService.java | 20 ++++++++++++++++--- .../DifferentManageAssembler.java | 11 +++++++++- .../InvestigationManageAssembler.java | 11 +++++++++- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java index 62c96a6fa..335d412f6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java @@ -131,12 +131,19 @@ public class ShiftManageDomainService { shiftManageDO.setOrganizationId(userPo.getOrganizationId()); shiftManageDO.setTopOrganizationId(userPo.getTopOrganizationId()); shiftManageDO.setOrganizationName(userPo.getOrganizationName()); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + final String userRealName = (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) + ? loginUser.getRealname() + : loginUser.getUsername(); shiftManageDO.setCreateBy(loginUser.getUserid()); - shiftManageDO.setCreateByName(loginUser.getUsername()); + shiftManageDO.setCreateByName(userRealName); shiftManageDO.setCreateTime(new Date()); shiftManageDO.setUpdateBy(loginUser.getUserid()); shiftManageDO.setUpdateTime(new Date()); - shiftManageDO.setUpdateByName(loginUser.getUsername()); + shiftManageDO.setUpdateByName(userRealName); return shiftManageService.insert(shiftManageDO); } @@ -145,8 +152,15 @@ public class ShiftManageDomainService { */ public Boolean update(ShiftManageDO shiftManageDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + final String userRealName = (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) + ? loginUser.getRealname() + : loginUser.getUsername(); shiftManageDO.setUpdateBy(loginUser.getUserid()); - shiftManageDO.setUpdateByName(loginUser.getUsername()); + shiftManageDO.setUpdateByName(userRealName); shiftManageDO.setUpdateTime(new Date()); return shiftManageService.update(shiftManageDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java index db5289098..6a5cfbb77 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java @@ -33,7 +33,16 @@ public class DifferentManageAssembler { if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } - String userName = loginUser.getUsername(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userName; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) { + userName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) { + userName = loginUser.getRealname(); + } else { + userName = loginUser.getUsername(); + } // 获取登录人id Long userId = loginUser.getUserid(); if(differentManageDTO.getDifferentManageId() != null){ diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java index 7f07fe476..366695a52 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java @@ -39,7 +39,16 @@ public class InvestigationManageAssembler { if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } - String userName = loginUser.getUsername(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userName; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) { + userName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) { + userName = loginUser.getRealname(); + } else { + userName = loginUser.getUsername(); + } // 获取登录人id Long userId = loginUser.getUserid(); UserPo userPo = loginUser.getUserPo();