wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-14 14:24:24 +08:00
parent b8bf1e62f9 ffae066127
commit 8459f2acc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
View File

@ -201,7 +201,7 @@ public class ActTaskController {
.map(index_ -> index_.getMember()) .map(index_ -> index_.getMember())
.filter(Objects::nonNull) .filter(Objects::nonNull)
.flatMap(index_ -> index_.stream()) .flatMap(index_ -> index_.stream())
.map(index_ -> (String) index_.get("id")) .map(index_ -> index_.get("id").toString())
.filter(index_ -> !userId.equals(index_)) // 过滤非本人 .filter(index_ -> !userId.equals(index_)) // 过滤非本人
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());

2
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -153,7 +153,7 @@ public class ActTaskService extends BaseServiceImpl {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.filter(index -> !index.isEmpty()) .filter(index -> !index.isEmpty())
.flatMap(index -> index.stream()) .flatMap(index -> index.stream())
.map(index -> (String) index.get("id")) .map(index -> index.get("id").toString())
.filter(index -> !userId.equals(index)) // 过滤非本人 .filter(index -> !userId.equals(index)) // 过滤非本人
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());