diff --git a/src/taoshop-manager/taoshop-manager-api/src/main/java/com/muses/taoshop/manager/service/IMenuService.java b/src/taoshop-manager/taoshop-manager-api/src/main/java/com/muses/taoshop/manager/service/IMenuService.java index c589c904e3e3d631af513da4fd578312bb252af1..935c2231c8bb5697a7955f4e6dfd0a7f5b1b11b9 100644 --- a/src/taoshop-manager/taoshop-manager-api/src/main/java/com/muses/taoshop/manager/service/IMenuService.java +++ b/src/taoshop-manager/taoshop-manager-api/src/main/java/com/muses/taoshop/manager/service/IMenuService.java @@ -1,16 +1,10 @@ package com.muses.taoshop.manager.service; -/** - *
- *  TODO 类说明
- * 
- * - * @author nicky - * @version 1.00.00 - *
- * 修改记录
- *    修改后版本:     修改人:  修改日期: 2018.09.22 12:33    修改内容:
- * 
- */ + +import com.muses.taoshop.manager.entity.Menu; + +import java.util.List; + public interface IMenuService { + Menu listMenu(int permissionId); } diff --git a/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/mapper/SysMenuMapper.java b/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/mapper/SysMenuMapper.java index e06aa3629715efbf86897bb17760b214df93536c..996645f7abc23a518bfd8ca475abc99c57d325cb 100644 --- a/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/mapper/SysMenuMapper.java +++ b/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/mapper/SysMenuMapper.java @@ -1,5 +1,11 @@ package com.muses.taoshop.manager.mapper; +import com.muses.taoshop.common.core.database.annotation.MybatisRepository; +import com.muses.taoshop.manager.entity.Menu; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** *
  *  菜单管理
@@ -12,6 +18,7 @@ package com.muses.taoshop.manager.mapper;
  *    修改后版本:     修改人:  修改日期: 2018.09.22 12:33    修改内容:
  * 
*/ +@MybatisRepository public interface SysMenuMapper { - + Menu listMenu(@Param("permissionId") int permissionId); } diff --git a/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/service/MenuServiceImpl.java b/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/service/MenuServiceImpl.java index 0485d81f843780d3530aa1eaab1ec3b6b850020d..7cbb4a18aa6d2be23c66521f0d059ef4d94d30fa 100644 --- a/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/service/MenuServiceImpl.java +++ b/src/taoshop-manager/taoshop-manager-service/src/main/java/com/muses/taoshop/manager/service/MenuServiceImpl.java @@ -1,5 +1,10 @@ package com.muses.taoshop.manager.service; +import com.muses.taoshop.manager.entity.Menu; +import com.muses.taoshop.manager.mapper.SysMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + /** *
  *  菜单管理业务接口
@@ -12,6 +17,14 @@ package com.muses.taoshop.manager.service;
  *    修改后版本:     修改人:  修改日期: 2018.09.22 12:34    修改内容:
  * 
*/ -public class MenuServiceImpl { +@Service +public class MenuServiceImpl implements IMenuService{ + + @Autowired + SysMenuMapper sysMenuMapper; + @Override + public Menu listMenu(int permissionId) { + return sysMenuMapper.listMenu(permissionId); + } } diff --git a/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java b/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java index 0f42b2527d97101fd809b4e0f722ee8349ecbc17..e2ba0abe91bfd45d6df21e3b1916cf0e7408a0c2 100644 --- a/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java +++ b/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java @@ -7,6 +7,7 @@ import com.muses.taoshop.manager.entity.Menu; import com.muses.taoshop.manager.entity.Permission; import com.muses.taoshop.manager.entity.SysRole; import com.muses.taoshop.manager.entity.SysUser; +import com.muses.taoshop.manager.service.IMenuService; import com.muses.taoshop.manager.service.ISysPermissionService; import com.muses.taoshop.manager.service.ISysRoleService; import com.muses.taoshop.manager.service.ISysUserService; @@ -62,6 +63,8 @@ public class LoginController extends BaseController { ISysRoleService iSysRoleService; @Autowired ISysPermissionService iSysPermissionService; + @Autowired + IMenuService iMenuService; @RequestMapping(value = "/toLogin") @GetMapping @@ -161,7 +164,8 @@ public class LoginController extends BaseController { /* 获取用户可以查看的菜单 */ List menuList = new ArrayList(); for(Permission p : permissions){ - menuList.add(p.getMenu()); + Menu menu = iMenuService.listMenu(p.getId()); + menuList.add(menu); } MenuTreeUtil treeUtil = new MenuTreeUtil(); diff --git a/src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/sider_bar_bk.html b/src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/sider_bar_bk.html index a5fd8a592772afc136fd6b48b1b91bc00b009385..a1bf5991a7b82ea387f5f2a8d84646635a6df4ea 100644 --- a/src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/sider_bar_bk.html +++ b/src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/sider_bar_bk.html @@ -15,8 +15,7 @@