diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 12c6d2edc..483fee3f3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -255,6 +255,7 @@ public class AdminGroupAction extends FessAdminAction { public static OptionalEntity getGroup(final CreateForm form) { return getEntity(form).map(entity -> { + copyMapToBean(form.attributes, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 38b378f53..07050d3c0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -209,6 +209,7 @@ public class AdminRoleAction extends FessAdminAction { public static OptionalEntity getRole(final CreateForm form) { return getEntity(form).map(entity -> { + copyMapToBean(form.attributes, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index f368e21f5..6cb87ef95 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -285,6 +285,7 @@ public class AdminUserAction extends FessAdminAction { public static OptionalEntity getUser(final CreateForm form) { return getEntity(form).map(entity -> { + copyMapToBean(form.attributes, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); copyBeanToBean(form, entity, op -> op.exclude(ArrayUtils.addAll(Constants.COMMON_CONVERSION_RULE, "password"))); if (form.crudMode.intValue() == CrudMode.CREATE || StringUtil.isNotBlank(form.password)) { final String encodedPassword = ComponentUtil.getComponent(FessLoginAssist.class).encryptPassword(form.password); diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java index 2251fc1d7..4291ea6db 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.app.web.base; +import java.util.Map; import java.util.function.Consumer; import javax.annotation.Resource; @@ -194,6 +195,10 @@ public abstract class FessBaseAction extends TypicalAction // has several interf BeanUtil.copyBeanToBean(src, dest, option); } + protected static void copyMapToBean(final Map src, final Object dest, final Consumer option) { + BeanUtil.copyMapToBean(src, dest, option); + } + protected static T copyBeanToNewBean(final Object src, final Class destClass) { return BeanUtil.copyBeanToNewBean(src, destClass); }