|
|
@@ -13,6 +13,7 @@ import org.apache.commons.beanutils.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.PermissionMapper;
|
|
|
import com.goafanti.common.dao.RolePermissionMapper;
|
|
|
import com.goafanti.common.dao.UserMapper;
|
|
|
@@ -252,13 +253,15 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Navigation> selectNavList(String aid){
|
|
|
+ public List<Navigation> selectNavList(){
|
|
|
+ String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
|
|
|
return permissionMapper.selectNavList(aid);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<Menu> selectMenuList(String superId) {
|
|
|
- List<SubMenu> subMenus = permissionMapper.selectMenuList(superId);
|
|
|
+ String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
|
|
|
+ List<SubMenu> subMenus = permissionMapper.selectMenuList(superId,aid);
|
|
|
List<Menu> menus = new ArrayList<Menu>();
|
|
|
try {
|
|
|
Menu m = null;
|
|
|
@@ -269,7 +272,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
}
|
|
|
if(menus != null && menus.size()>0){
|
|
|
for(Menu menu: menus){
|
|
|
- subMenus = permissionMapper.selectMenuList(menu.getId());
|
|
|
+ subMenus = permissionMapper.selectMenuList(menu.getId(),aid);
|
|
|
menu.setSubMenus(subMenus);
|
|
|
}
|
|
|
}
|