|
@@ -64,10 +64,10 @@ public class ResourceRuleJob extends AbstractJob {
|
|
|
|
|
|
|
|
//Step 2. get button - role
|
|
//Step 2. get button - role
|
|
|
|
|
|
|
|
- sb.append("" +"|"+partyRolePos.stream().map(x->x.getName()).collect(Collectors.joining("|")) + lineseparator );
|
|
|
|
|
|
|
|
|
|
List<String> roleList = partyRolePos.stream().map(x -> x.getName()).collect(Collectors.toList());
|
|
List<String> roleList = partyRolePos.stream().map(x -> x.getName()).collect(Collectors.toList());
|
|
|
-
|
|
|
|
|
|
|
+ roleList.add(0,"all");
|
|
|
|
|
+ sb.append("" +"|"+StringUtils.join(roleList, "|") + lineseparator );
|
|
|
List<Map<String, Object>> list = fetchRecords("button_role_1");
|
|
List<Map<String, Object>> list = fetchRecords("button_role_1");
|
|
|
if (list != null) {
|
|
if (list != null) {
|
|
|
for (Map<String, Object> map : list) {
|
|
for (Map<String, Object> map : list) {
|
|
@@ -120,6 +120,16 @@ public class ResourceRuleJob extends AbstractJob {
|
|
|
map.put(r,l);
|
|
map.put(r,l);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ }else if("all".equals(type)){
|
|
|
|
|
+ if(map.containsKey("all")){
|
|
|
|
|
+ map.get("all").add(label);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ List<String> l = new ArrayList<>();
|
|
|
|
|
+ l.add(label);
|
|
|
|
|
+ map.put("all",l);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|