|
@@ -486,15 +486,17 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
HashSet<String> hashSet = new HashSet<>(userList);
|
|
|
List<String> users = new ArrayList<>();
|
|
|
hashSet.forEach(user -> {
|
|
|
- String[] array = user.split("-");
|
|
|
- if (!users.contains(array[0])) {
|
|
|
- User bUser = this.userClient.userInfoById(Long.parseLong(array[0])).getData();
|
|
|
- if (bUser != null) {
|
|
|
- result.add(new FileUserVO(array[0], bUser.getRealName()));
|
|
|
- } else {
|
|
|
- result.add(new FileUserVO(array[0], array[1]));
|
|
|
+ if(Func.isNotEmpty(user) && user.contains("-") && user.length() > 1) {
|
|
|
+ String[] array = user.split("-");
|
|
|
+ if (!users.contains(array[0]) ) {
|
|
|
+ User bUser = this.userClient.userInfoById(Long.parseLong(array[0])).getData();
|
|
|
+ if (bUser != null) {
|
|
|
+ result.add(new FileUserVO(array[0], bUser.getRealName()));
|
|
|
+ } else {
|
|
|
+ result.add(new FileUserVO(array[0], array[1]));
|
|
|
+ }
|
|
|
+ users.add(array[0]);
|
|
|
}
|
|
|
- users.add(array[0]);
|
|
|
}
|
|
|
});
|
|
|
}
|