diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index ec4c2e1..d6a52a5 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -593,21 +593,24 @@ public class CtqyyClient extends CommonHttpClient { AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser()); if (authUserEntity == null) userName = null; - userName = authUserEntity.getUserName(); + userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName(); } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser()); - userName = authUserEntity.getUserName(); + userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName(); } else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) { AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser()); - userName = authUserEntity.getUserName(); + userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName(); } else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) { AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser()); - userName = authUserEntity.getUserName(); + userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName(); } if (userName == null) { List authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper().eq("code", orderEntity.getInvCode())); if (CollUtil.isNotEmpty(authWarehouseUsers)) { - return authWarehouseUsers.get(0).getUserName(); + AuthWarehouseUser authWarehouseUser = authWarehouseUsers.get(0); + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser()); + userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName(); + return userName; } } return userName;