diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index f457388b6..123aea86b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -455,10 +455,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl" + baseEO.getName() + ""; + //消息英文--不带标签 String contentNo = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows:" + sbContentNo; //消息英文--带标签 - String contentYes = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows:"+ "
" + sbContentYes;; + String contentYes = "The "+ hrefTemp+" virtual list you subscribed to has been updated as follows:"+ "
" + sbContentYes;; int countInfoNo = 1; StringBuilder sbContentINfoNo = new StringBuilder(); @@ -483,9 +487,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"+sbContentInfoYes; - - + String contentInfoYes = "您所订阅的"+hrefTemp+"虚拟清单已更新,更新内容如下:"+"
"+sbContentInfoYes; List userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId()); List thirdIdList = new ArrayList<>(); @@ -548,20 +550,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList()); if(userIdList.size() != 0){ + String hrefTemp = "" + baseEO.getName() + ""; //封装消息的实体类 The XX virtual list you subscribed to has been withdrawn String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; //Please note that the XX virtual list you subscribed to has been withdrawn. String contentLog = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - String contentCn = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; - String contentInfoEn = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; + String contentCnNo = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; + String contentCnYes = "您订阅的虚拟清单"+ hrefTemp+"已被撤回."; + String contentInfoEnNo = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; + String contentInfoEnYes = "Please note that the "+ hrefTemp+" virtual list you subscribed to has been withdrawn."; SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, - contentInfoEn, - contentInfoEn, + contentInfoEnNo, + contentInfoEnYes, MessageTypeEnum.READ.getValue(), MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), - contentCn,contentCn); + contentCnNo,contentCnYes); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title); }