diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index b5f5bc9b8..39a839166 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1011,6 +1011,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImplXXX对“GB 7258 进行了修改请及时查看”) @@ -1026,9 +1030,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + String id = (String) map.get("id"); + String title = (String) map.get("title"); + String href = ""+serialNumber+""; String content = sysUser.getRealname()+"对"+serialNumber+"进行了修改请及时查看"; - String contentInfo = sysUser.getRealname()+"修改标准"+serialNumber+"中"+sb.toString(); + String contentInfo = sysUser.getRealname()+"修改标准"+href+"中"+sbStr.toString(); //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement); @@ -1042,8 +1051,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userNameListTemp = new ArrayList<>(); - List serialNumberList = new ArrayList<>(); //(1)此种情况为编辑前代替标准就已经有数据了 if (StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)) { //需要向被替代标准的法规工程师发送站内通知和飞书信息,提醒内容:"新标准编号"已实施,请注意更新“替代标准编号”状态 @@ -1076,14 +1083,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = this.listMaps(lambdaQueryWrapperTemp); List userNameListTemp = new ArrayList<>(); List serialNumberList = new ArrayList<>(); + StringBuilder sb = new StringBuilder(); for (Map stringObjectMap : mapList) { + String id = (String) stringObjectMap.get("id"); + String serialNumber = (String) stringObjectMap.get("serial_number"); + String title = (String) stringObjectMap.get("title"); userNameListTemp.add((String) stringObjectMap.get("create_by")); - serialNumberList.add((String) stringObjectMap.get("serial_number")); + serialNumberList.add(serialNumber); + + String href = ""+serialNumber+","; + sb.append(href); + } + String sbStr = ""; + if(ObjectUtils.isNotEmpty(sb)){ + sbStr = sb.substring(0,sb.length()-1); } List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ",")); List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); String content = "新标准编号已实施,请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态"; - String contentInfo = "新标准编号已实施,请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态," + "链接: http://localhost:3000/docManage/library"; + String contentInfo = "新标准编号已实施,请注意更新替代标准编号:" + sbStr + "的状态," + "链接: http://localhost:3000/docManage/library"; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement);