|
|
@@ -164,12 +164,19 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
|
|
|
String now = DateUtil.formatDate(DateUtil.now());
|
|
|
User user1 = userService.getUserByEhr(sealHandover.getHandoverPersonNo());
|
|
|
User user2 = userService.getUserByEhr(sealHandover.getReceiverNo());
|
|
|
+ List<Long> userList = new ArrayList<>();
|
|
|
+ if (user1 != null){
|
|
|
+ userList.add(user1.getId());
|
|
|
+ }
|
|
|
+ if (user2 != null){
|
|
|
+ userList.add(user2.getId());
|
|
|
+ }
|
|
|
|
|
|
String title = "有關 (" + seal_type + sealHandover.getSealNo() + ") 的交接登記已於" + now + "完成;交出人:" + sealHandover.getHandoverPersonName() + ";接收人:" + sealHandover.getReceiverName();
|
|
|
Notice notice = new Notice();
|
|
|
notice.setTitle(title);
|
|
|
notice.setBusinessType("sealhandover");
|
|
|
- notice.setTargetIds(user1.getId() + "," + user2.getId());
|
|
|
+ notice.setTargetIds(StringUtil.join(userList));
|
|
|
return sendNotice(notice);
|
|
|
}
|
|
|
|