WMS收货管理、上架管理、入库异常的创建人姓名,审核人姓名修改存账号的姓名
This commit is contained in:
+15
-3
@@ -43,19 +43,31 @@ public class InOrderAbnormalAssembler {
|
||||
if (ObjectUtil.isNull(loginUser)) {
|
||||
throw new DigitalLogisticsException(UserError.TIMEOUT);
|
||||
}
|
||||
String userName = loginUser.getUsername();
|
||||
// 获取登录人id
|
||||
Long userId = loginUser.getUserid();
|
||||
// 获取用户姓名(优先从UserPo获取,如果为空则使用realname,最后使用username作为兜底)
|
||||
String userRealName = null;
|
||||
if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
|
||||
&& !loginUser.getUserPo().getUserName().trim().isEmpty()) {
|
||||
// 优先使用UserPo中的userName(用户真实姓名)
|
||||
userRealName = loginUser.getUserPo().getUserName();
|
||||
} else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) {
|
||||
// 其次使用realname
|
||||
userRealName = loginUser.getRealname();
|
||||
} else {
|
||||
// 最后使用username(账号)作为兜底
|
||||
userRealName = loginUser.getUsername();
|
||||
}
|
||||
if(inOrderAbnormalDTO.getInOrderAbnormalId() != null){
|
||||
inOrderAbnormalDO.setUpdateBy(userId);
|
||||
inOrderAbnormalDO.setUpdateByName(userName);
|
||||
inOrderAbnormalDO.setUpdateByName(userRealName);
|
||||
inOrderAbnormalDO.setUpdateTime(new Date());
|
||||
}else {
|
||||
inOrderAbnormalDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
|
||||
inOrderAbnormalDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
|
||||
inOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
||||
inOrderAbnormalDO.setCreateBy(userId);
|
||||
inOrderAbnormalDO.setCreateByName(userName);
|
||||
inOrderAbnormalDO.setCreateByName(userRealName);
|
||||
inOrderAbnormalDO.setCreateTime(new Date());
|
||||
inOrderAbnormalDO.setDelFlag(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user