From fac782d6b513f343e8bdc1942b56de6111d6e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 10 Mar 2025 21:42:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AppUserController.java   |  1 +
 .../cfs/event/TicketReplyEvent.java           | 32 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

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<Integer> 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<Integer> userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
-        List<AdminUser> 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<Integer> userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
+            List<AdminUser> 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()))
+                );
+            }
         }
     }