diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/UserSelectHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/UserSelectHandler.java index 0fc1ebfc34e9fd7d1c0bbb8c9d8a6b9ebc0eb77b..efd4ee5d0b471291e5bdbf3dee01b1fafd3ff3f9 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/UserSelectHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/UserSelectHandler.java @@ -211,38 +211,38 @@ public class UserSelectHandler extends FormHandlerBase { if (CollectionUtils.isEmpty(textList)) { return textList; } - List valueList = new ArrayList<>(); + JSONArray valueList = new JSONArray(); for (String textStr : textList) { if (groupList.contains(GroupSearch.COMMON.getValue())) { if (Objects.equals(textStr, UserType.ALL.getText())) { valueList.add(GroupSearch.COMMON.getValuePlugin() + UserType.ALL.getValue()); - break; + continue; } } if (groupList.contains(GroupSearch.USER.getValue())) { UserVo userVo = userMapper.getUserByUserId(textStr); if (userVo != null) { valueList.add(GroupSearch.USER.getValuePlugin() + userVo.getUuid()); - break; + continue; } List list = userMapper.getUserUuidListByUserName(textStr); if (CollectionUtils.isNotEmpty(list)) { valueList.add(GroupSearch.USER.getValuePlugin() + list.get(0)); - break; + continue; } } if (groupList.contains(GroupSearch.TEAM.getValue())) { List list = teamMapper.getTeamUuidByName(textStr); if (CollectionUtils.isNotEmpty(list)) { valueList.add(GroupSearch.TEAM.getValuePlugin() + list.get(0)); - break; + continue; } } if (groupList.contains(GroupSearch.ROLE.getValue())) { List list = roleMapper.getRoleUuidByName(textStr); if (CollectionUtils.isNotEmpty(list)) { valueList.add(GroupSearch.ROLE.getValuePlugin() + list.get(0)); - break; + continue; } } }