fix: 修复一些问题
This commit is contained in:
parent
dbf72adab6
commit
fac782d6b5
|
|
@ -208,6 +208,7 @@ public class AppUserController extends ControllerBase {
|
||||||
List<Integer> companyIds = appUserService.lambdaQuery()
|
List<Integer> companyIds = appUserService.lambdaQuery()
|
||||||
.select(AppUser::getCompanyId)
|
.select(AppUser::getCompanyId)
|
||||||
.eq(AppUser::getIsPrimary, true)
|
.eq(AppUser::getIsPrimary, true)
|
||||||
|
.eq(AppUser::getIsDel, false)
|
||||||
.ne(AppUser::getId, request.getId())
|
.ne(AppUser::getId, request.getId())
|
||||||
.list()
|
.list()
|
||||||
.stream()
|
.stream()
|
||||||
|
|
|
||||||
|
|
@ -65,21 +65,23 @@ public class TicketReplyEvent extends ApplicationEvent implements ApplicationCon
|
||||||
|
|
||||||
private void sendUserMessage(){
|
private void sendUserMessage(){
|
||||||
//我的待办
|
//我的待办
|
||||||
List<Integer> userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
|
if(StrUtil.isNotBlank(ticket.getHandle())) {
|
||||||
List<AdminUser> adminUsers = adminUserService.listByIds(userIds);
|
List<Integer> userIds = Arrays.stream(ticket.getHandle().split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
|
||||||
if (CollectionUtil.isNotEmpty(adminUsers)) {
|
List<AdminUser> adminUsers = adminUserService.listByIds(userIds);
|
||||||
adminUsers.forEach(c -> adminMessageService.add(
|
if (CollectionUtil.isNotEmpty(adminUsers)) {
|
||||||
new AdminMessage()
|
adminUsers.forEach(c -> adminMessageService.add(
|
||||||
.setNo(ticket.getNo())
|
new AdminMessage()
|
||||||
.setTitle(ticket.getTitle())
|
.setNo(ticket.getNo())
|
||||||
.setUserId(c.getId())
|
.setTitle(ticket.getTitle())
|
||||||
.setSourceId(ticket.getId())
|
.setUserId(c.getId())
|
||||||
.setSource(0)
|
.setSourceId(ticket.getId())
|
||||||
.setType(MessageType.WorkOrderAssignment.getState())
|
.setSource(0)
|
||||||
.setSubType(MessageSubType.TicketNewMessage.getState())
|
.setType(MessageType.WorkOrderAssignment.getState())
|
||||||
.setIsRead(false)
|
.setSubType(MessageSubType.TicketNewMessage.getState())
|
||||||
.setCreateTime(LocalDateTime.now()))
|
.setIsRead(false)
|
||||||
);
|
.setCreateTime(LocalDateTime.now()))
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue