文档库--跳转修改
This commit is contained in:
+8
-6
@@ -213,7 +213,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
String title = (String) map.get("title");
|
String title = (String) map.get("title");
|
||||||
serialNumberList.add(serialNumber);
|
serialNumberList.add(serialNumber);
|
||||||
|
|
||||||
String href = "<a href='/docManage/library?id:" + id +
|
String href = "<a href='/docManage/library/detail?id:" + id +
|
||||||
"&title:" + title +
|
"&title:" + title +
|
||||||
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
|
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
|
||||||
sb.append(href);
|
sb.append(href);
|
||||||
@@ -1300,7 +1300,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String title = (String) map.get("title");
|
String title = (String) map.get("title");
|
||||||
String serialNumber = (String) map.get("serial_number");
|
String serialNumber = (String) map.get("serial_number");
|
||||||
String href = "<a href='/docManage/library?id:" + idTemp +
|
String href = "<a href='/docManage/library/detail?id:" + idTemp +
|
||||||
"&title:" + title +
|
"&title:" + title +
|
||||||
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
|
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
|
||||||
|
|
||||||
@@ -1718,7 +1718,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
|
|
||||||
String id = (String) map.get("id");
|
String id = (String) map.get("id");
|
||||||
String title = (String) map.get("title");
|
String title = (String) map.get("title");
|
||||||
String href = "<a href='/docManage/library?id:" + id +
|
String href = "<a href='/docManage/library/detail?id:" + id +
|
||||||
"&title:" + title +
|
"&title:" + title +
|
||||||
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
|
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
|
||||||
|
|
||||||
@@ -1777,7 +1777,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
userNameListTemp.add((String) stringObjectMap.get("create_by"));
|
userNameListTemp.add((String) stringObjectMap.get("create_by"));
|
||||||
serialNumberList.add(serialNumber);
|
serialNumberList.add(serialNumber);
|
||||||
|
|
||||||
String href = "<a href='/docManage/library?id:" + id +
|
String href = "<a href='/docManage/library/detail?id:" + id +
|
||||||
"&title:" + title +
|
"&title:" + title +
|
||||||
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
|
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
|
||||||
sb.append(href);
|
sb.append(href);
|
||||||
@@ -2918,16 +2918,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String pullMessage(String departIds, String userIds, String documentIds) {
|
public String pullMessage(String departIds, String userIds, String documentIds) {
|
||||||
departIds = "c6d7cb4deeac411cb3384b1b31278596";
|
// departIds = "c6d7cb4deeac411cb3384b1b31278596";
|
||||||
// if(StringUtils.isBlank(documentIds)){
|
// if(StringUtils.isBlank(documentIds)){
|
||||||
// return "请选择文档";
|
// return "请选择文档";
|
||||||
// }
|
// }
|
||||||
List<String> userIdList = new ArrayList<>();
|
List<String> userIdList = new ArrayList<>();
|
||||||
|
List<String> thirdIdList = new ArrayList<>();
|
||||||
if (StringUtils.isNotBlank(departIds)) {
|
if (StringUtils.isNotBlank(departIds)) {
|
||||||
//查询部门下的人员
|
//查询部门下的人员
|
||||||
List<SysUser> userList = sysUserService.getUserListByDepIds(Arrays.asList(departIds.split(",")));
|
List<SysUser> userList = sysUserService.getUserListByDepIds(Arrays.asList(departIds.split(",")));
|
||||||
if (userList.size() != 0) {
|
if (userList.size() != 0) {
|
||||||
userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
||||||
|
thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2946,7 +2948,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
||||||
//飞书
|
//飞书
|
||||||
try {
|
try {
|
||||||
iFeishuService.batchSendMessage(new String[userIdList.size()], content, null, null);
|
iFeishuService.batchSendMessage(new String[thirdIdList.size()], content, "转发推送", null);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("飞书推送失败");
|
log.error("飞书推送失败");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user