长泰操作人修改

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<AuthWarehouseUser> authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper<AuthWarehouseUser>().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;