diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java index d89818259eadd59b7b2effc685b1ccfb3d6937e0..8d0a636c0987e7ad01d20cd9635eb5dbda6f0208 100644 --- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java @@ -191,7 +191,19 @@ public class LabelTypeService implements Serializable { } public OptionalEntity<LabelType> getLabelType(final String id) { - return labelTypeBhv.selectByPK(id); + return labelTypeBhv.selectByPK(id).map(entity -> { + final List<LabelToRole> wctrtmList = labelToRoleBhv.selectList(wctrtmCb -> { + wctrtmCb.query().setLabelTypeId_Equal(entity.getId()); + }); + if (!wctrtmList.isEmpty()) { + final List<String> roleTypeIds = new ArrayList<String>(wctrtmList.size()); + for (final LabelToRole mapping : wctrtmList) { + roleTypeIds.add(mapping.getRoleTypeId()); + } + entity.setRoleTypeIds(roleTypeIds.toArray(new String[roleTypeIds.size()])); + } + return entity; + }); } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index 6d0da998f8f9f6a5e1cc1293df45ac4a4af581b7..c7f785b6cb00a9dad0cda5406b1cfe3d505566a0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -16,7 +16,6 @@ package org.codelibs.fess.app.web.admin.labeltype; - import javax.annotation.Resource; import org.codelibs.fess.Constants;