Merge remote-tracking branch 'origin/feature/0729-group-message' into feature/0812_opt

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CustomerServiceBatchSendingServiceImpl.java

@@ -306,9 +306,14 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
             query.getClientTypes().parallelStream().forEach(item -> {
 
                 CustomerService.NotifyMessage receiveQuery = CustomerService.NotifyMessage.builder()
-                        .clientType(ClientEnum.valueOf(item))
-                        .subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
-                        .build();
+                    .clientType(ClientEnum.valueOf(item))
+                    .delFlag(0)
+                    .lockFlag(0)
+                    //.subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
+                    .build();
+                if (StringUtils.isNotEmpty(info.getSendSubject())) {
+                    receiveQuery.setSubjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()));
+                }
 
                 Page<CustomerService.MessageReceives> page = PageUtil.getPage(1, 10);
                 // 统计当前匹配用户数量
@@ -472,9 +477,14 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                         targetGroups.forEach(clientType -> {
 
                             CustomerService.NotifyMessage receiveQuery = CustomerService.NotifyMessage.builder()
-                                    .clientType(ClientEnum.valueOf(clientType))
-                                    .subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
-                                    .build();
+                                .clientType(ClientEnum.valueOf(clientType))
+                                .lockFlag(0)
+                                .delFlag(0)
+                                //.subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
+                                .build();
+                            if (StringUtils.isNotBlank(info.getSendSubject())) {
+                                receiveQuery.setSubjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()));
+                            }
 
                             Page<CustomerService.MessageReceives> page = PageUtil.getPage(1, 10);
                             // 统计当前匹配用户数量

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/im/CustomerService.java

@@ -29,6 +29,8 @@ public class CustomerService {
         private List<String> receives;
         private ClientEnum clientType;
         private String subjectId;
+        private Integer lockFlag;
+        private Integer delFlag;
         private List<String> subjectIds;
 
         private String title;