weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WMS移位管理、盘点管理、差异管理的创建人姓名，审核人姓名修改存账号的姓名

Browse Source
This commit is contained in:
秦鸿展
2026-03-03 16:30:38 +08:00
parent 849b8da2dc
commit 50a32c176d
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+17 -3
View File
@@ -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);
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java
+10 -1
View File
@@ -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){
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java
+10 -1
View File
@@ -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();