From 0c21bd46a30d28c0c2d41273e086216b7f8aaa17 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 14 Oct 2024 21:13:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/service/auth/impl/AuthAdminServiceImpl.java | 7 +++++-- .../com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 037837cbf..d49df8623 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -214,13 +214,16 @@ public class AuthAdminServiceImpl extends ServiceImpl i @Override public List getUserByDeptCode(String deptCode) { - DeptEntity deptEntity = deptService.selectByCode(deptCode); List deptUserEntitys = deptUserDao.selectList(new LambdaQueryWrapper().eq(DeptUserEntity::getDeptId, deptEntity.getId())); List userIds = deptUserEntitys.stream() .map(DeptUserEntity::getUserId) .collect(Collectors.toList()); - List authAdmins = authAdminDao.selectList(new LambdaQueryWrapper().in(AuthAdmin::getId, userIds)); + List authAdmins = new ArrayList<>(); + if (CollUtil.isEmpty(userIds)){ + return authAdmins; + } + authAdmins = authAdminDao.selectList(new LambdaQueryWrapper().in(AuthAdmin::getId, userIds)); return authAdmins; } diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java index 52f0a698e..704cf514d 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java @@ -92,7 +92,7 @@ public class AsyncIoCollectOrderDownloadTask implements SchedulingConfigurer { try{ collectOriginService.downloadOrderV2(collectOrderRequest); }catch (Exception e){ - log.error("自动下载原始下载出错:{}", e.getMessage()); + log.error("自动下载原始单据出错:{}", e.getMessage()); } } }