diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index f431972a..a243d598 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -208,6 +208,7 @@ public class AppUserController extends ControllerBase { List companyIds = appUserService.lambdaQuery() .select(AppUser::getCompanyId) .eq(AppUser::getIsPrimary, true) + .eq(AppUser::getIsDel, false) .ne(AppUser::getId, request.getId()) .list() .stream() diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/event/TicketReplyEvent.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/event/TicketReplyEvent.java index 96c7bd2b..57968cbf 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/event/TicketReplyEvent.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/event/TicketReplyEvent.java @@ -65,21 +65,23 @@ public class TicketReplyEvent extends ApplicationEvent implements ApplicationCon private void sendUserMessage(){ //ζˆ‘ηš„εΎ…εŠž - List userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList()); - List adminUsers = adminUserService.listByIds(userIds); - if (CollectionUtil.isNotEmpty(adminUsers)) { - adminUsers.forEach(c -> adminMessageService.add( - new AdminMessage() - .setNo(ticket.getNo()) - .setTitle(ticket.getTitle()) - .setUserId(c.getId()) - .setSourceId(ticket.getId()) - .setSource(0) - .setType(MessageType.WorkOrderAssignment.getState()) - .setSubType(MessageSubType.TicketNewMessage.getState()) - .setIsRead(false) - .setCreateTime(LocalDateTime.now())) - ); + if(StrUtil.isNotBlank(ticket.getHandle())) { + List userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList()); + List adminUsers = adminUserService.listByIds(userIds); + if (CollectionUtil.isNotEmpty(adminUsers)) { + adminUsers.forEach(c -> adminMessageService.add( + new AdminMessage() + .setNo(ticket.getNo()) + .setTitle(ticket.getTitle()) + .setUserId(c.getId()) + .setSourceId(ticket.getId()) + .setSource(0) + .setType(MessageType.WorkOrderAssignment.getState()) + .setSubType(MessageSubType.TicketNewMessage.getState()) + .setIsRead(false) + .setCreateTime(LocalDateTime.now())) + ); + } } }