Commit 9f40890b authored by 周健威's avatar 周健威

权限 商品 相关

parent c108b3c4
...@@ -19,7 +19,7 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{ ...@@ -19,7 +19,7 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{
String text; String text;
List<AuthorityMenuTree> nodes = new ArrayList<AuthorityMenuTree>(); List<AuthorityMenuTree> nodes = new ArrayList<AuthorityMenuTree>();
String icon; String icon;
List<Element> elements = CollUtil.newArrayList(); List<Integer> elementIds = CollUtil.newArrayList();
public String getIcon() { public String getIcon() {
return icon; return icon;
...@@ -37,12 +37,12 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{ ...@@ -37,12 +37,12 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{
public AuthorityMenuTree() { public AuthorityMenuTree() {
} }
public List<Element> getElements() { public List<Integer> getElementIds() {
return elements; return elementIds;
} }
public void setElements(List<Element> elements) { public void setElementIds(List<Integer> elementIds) {
this.elements = elements; this.elementIds = elementIds;
} }
public String getText() { public String getText() {
......
...@@ -207,32 +207,12 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> { ...@@ -207,32 +207,12 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
List<Menu> menus = menuMapper.selectMenuByAuthorityId(String.valueOf(groupId), AdminCommonConstant.AUTHORITY_TYPE_GROUP); List<Menu> menus = menuMapper.selectMenuByAuthorityId(String.valueOf(groupId), AdminCommonConstant.AUTHORITY_TYPE_GROUP);
List<AuthorityMenuTree> trees = new ArrayList<AuthorityMenuTree>(); List<AuthorityMenuTree> trees = new ArrayList<AuthorityMenuTree>();
AuthorityMenuTree node = null; AuthorityMenuTree node = null;
List<Integer> elementIds = getAuthorityElement(groupId);
for (Menu menu : menus) { for (Menu menu : menus) {
node = new AuthorityMenuTree(); node = new AuthorityMenuTree();
node.setText(menu.getTitle()); node.setText(menu.getTitle());
BeanUtils.copyProperties(menu, node); BeanUtils.copyProperties(menu, node);
trees.add(node); node.setElementIds(elementIds);
}
return trees;
}
/**
* 获取群主关联的菜单V2
*
* @param groupId
* @return
*/
public List<AuthorityMenuTree> getAuthorityMenuV2(int groupId) {
List<Menu> menus = menuMapper.selectMenuByAuthorityId(String.valueOf(groupId), AdminCommonConstant.AUTHORITY_TYPE_GROUP);
List<AuthorityMenuTree> trees = new ArrayList<AuthorityMenuTree>();
AuthorityMenuTree node = null;
for (Menu menu : menus) {
node = new AuthorityMenuTree();
node.setText(menu.getTitle());
BeanUtils.copyProperties(menu, node);
node.setElements(elementMapper.select(new Element(){{
setMenuId(menu.getId().toString());
}}));
trees.add(node); trees.add(node);
} }
return trees; return trees;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment