From a5d7cf8884fa21b7f80b30113d57c48d04b9d335 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 15 May 2019 17:58:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/SysMenuController.java | 8 +++-- .../iformall/service/MallUserInfoService.java | 7 ---- .../service/impl/MallUserInfoServiceImpl.java | 32 ++++--------------- .../controller/sys/SysMenuController.java | 8 +++-- 4 files changed, 19 insertions(+), 36 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index c45a9cc6a..da8218665 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -70,8 +70,12 @@ public class SysMenuController extends BaseController { public ResultData getList() { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); - List menuList = mallUserInfoService.getAllPermissions(user); - return new ResultData(Result.SUCCESS, "查询成功", menuList); + List menuList = mallPermissionService.getUserMenuList(user, 0L, false); + Set permissions = mallUserInfoService.getUserPermissions(user); + Map map = new HashMap<>(); + map.put("menuList", menuList); + map.put("permissions", permissions); + return new ResultData(map); } @ApiOperation("菜单信息") diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java index ea19f0f92..700802942 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java @@ -175,11 +175,4 @@ public interface MallUserInfoService { * @return */ Set getUserPermissions(MallUserInfo record); - - /** - * 用户所有菜单 - * @param record - * @return - */ - List getAllPermissions(MallUserInfo record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 8049f9ea4..8a6b2908e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -6,17 +6,17 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallPermission; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.MallUserRole; -import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.*; import com.iformall.domain.vo.MallUserInfoVo; +import com.iformall.enums.EnumMenuType; +import com.iformall.enums.EnumUserAdmin; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallUserInfoMapper; import com.iformall.mapper.MallUserRoleMapper; import com.iformall.mapper.WxMsgValidationcodeMapper; import com.iformall.service.MallUserInfoService; +import com.iformall.service.WxMallService; import com.iformall.utils.Constant; import net.sf.saxon.trans.Err; import org.apache.commons.lang3.StringUtils; @@ -45,6 +45,9 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Autowired WxMsgValidationcodeMapper wxMsgValidationcodeMapper; + @Autowired + private WxMallService mallService; + @Override public PageInfo listAsPage(MallUserInfo record, Integer pageIndex, Integer pageSize) { @@ -263,25 +266,4 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { return permsSet; } - @Override - public List getAllPermissions(MallUserInfo record) { - List menuList; - if(record.isFmSuperAdmin()) { - // 富茂超管 - MallPermission q = new MallPermission(); - q.setAvailable("Y"); - menuList = mallPermissionMapper.select(q); - } else { - menuList = mallUserInfoMapper.queryAllMenu(record.getId()); - } - for(MallPermission info: menuList) { - MallPermission parentMP = mallPermissionMapper.selectByPrimaryKey(info.getParentId()); - if(parentMP != null) { - info.setParentName(parentMP.getName()); - } - } - return menuList; - } - - } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index ede5d0c89..27db59722 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -77,8 +77,12 @@ public class SysMenuController extends BaseController { public ResultData getList() { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); - List menuList = mallUserInfoService.getAllPermissions(user); - return new ResultData(Result.SUCCESS, "查询成功", menuList); + List menuList = mallPermissionService.getUserMenuList(user, 0L, false);; + Set permissions = mallUserInfoService.getUserPermissions(user); + Map map = new HashMap<>(); + map.put("menuList", menuList); + map.put("permissions", permissions); + return new ResultData(map); } @ApiOperation("添加菜单/权限")