Skip to content

Commit

Permalink
Merge pull request #855 from support-project/fix_editor_check
Browse files Browse the repository at this point in the history
#757 Do not erase the login user in the display of the logined user
  • Loading branch information
koda-masaru authored Sep 15, 2017
2 parents f27a302 + 20608d1 commit 80af29f
Showing 1 changed file with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,10 @@ public List<LabelValue> filterTargetLabel(List<GroupsEntity> groups, List<UsersE
}

for (UsersEntity usersEntity : users) {
// 自分の場合はスキップ
if (loginedUser != null) {
if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
continue;
}
}

// グループに公開されていてかつそのグループに所属してる場合もスキップ
// グループに公開されていてかつそのグループに所属してる場合はスキップ
if (groupUserIds.contains(usersEntity.getUserId())) {
continue;
}

LabelValue labelValue = new LabelValue();
labelValue.setLabel(NAME_PREFIX_USER + usersEntity.getUserName());
labelValue.setValue(ID_PREFIX_USER + usersEntity.getUserId());
Expand Down

0 comments on commit 80af29f

Please sign in to comment.