From be5b79cbb1bc77783e2881c2011c4c8ee7b4d25c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 12 Dec 2023 09:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E6=93=8D=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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;