xui:permissions转换为xui:roles之后与已有的xui:roles合并，并且转换为字符串

nop-web/src/main/java/io/nop/web/page/PageProvider.java

@@ -18,6 +18,7 @@
 import io.nop.commons.concurrent.executor.ExecutorHelper;
 import io.nop.commons.concurrent.executor.GlobalExecutors;
 import io.nop.commons.lang.impl.Cancellable;
+import io.nop.commons.util.CollectionHelper;
 import io.nop.commons.util.StringHelper;
 import io.nop.core.CoreConstants;
 import io.nop.core.i18n.I18nMessageManager;
@@ -186,15 +187,17 @@ public Map<String, Object> getPage(String path, String locale) {
         return data;
     }
 
-    Object transformPermissions(Object value) {
+    protected Object transformPermissions(Object value) {
         Map<String, Object> map = (Map<String, Object>) value;
         Object perms = map.remove(WebConstants.ATTR_XUI_PERMISSIONS);
         if (perms == null)
             return value;
 
         Set<String> permissions = ConvertHelper.toCsvSet(perms);
         Set<String> roles = rolePermissionMapping.getRolesWithPermission(permissions);
-        map.put(WebConstants.ATTR_XUI_ROLES, roles);
+        Set<String> oldRoles = ConvertHelper.toCsvSet(map.get(WebConstants.ATTR_XUI_ROLES));
+        Set<String> merged = CollectionHelper.mergeSet(roles, oldRoles);
+        map.put(WebConstants.ATTR_XUI_ROLES, merged);
         return map;
     }