Просмотр исходного кода

[菜单][修改]:菜单整理

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
a5d7cf8884
4 измененных файлов: 19 добавлений и 36 удалений
  1. +6
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  2. +0
    -7
      mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java
  3. +7
    -25
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
  4. +6
    -2
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java

+ 6
- 2
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<MallPermission> menuList = mallUserInfoService.getAllPermissions(user);
return new ResultData(Result.SUCCESS, "查询成功", menuList);
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L, false);
Set<String> permissions = mallUserInfoService.getUserPermissions(user);
Map map = new HashMap<>();
map.put("menuList", menuList);
map.put("permissions", permissions);
return new ResultData(map);
}

@ApiOperation("菜单信息")


+ 0
- 7
mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java Просмотреть файл

@@ -175,11 +175,4 @@ public interface MallUserInfoService {
* @return
*/
Set<String> getUserPermissions(MallUserInfo record);

/**
* 用户所有菜单
* @param record
* @return
*/
List<MallPermission> getAllPermissions(MallUserInfo record);
}

+ 7
- 25
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<MallUserInfo> listAsPage(MallUserInfo record, Integer pageIndex, Integer pageSize) {
@@ -263,25 +266,4 @@ public class MallUserInfoServiceImpl implements MallUserInfoService {
return permsSet;
}

@Override
public List<MallPermission> getAllPermissions(MallUserInfo record) {
List<MallPermission> 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;
}


}

+ 6
- 2
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<MallPermission> menuList = mallUserInfoService.getAllPermissions(user);
return new ResultData(Result.SUCCESS, "查询成功", menuList);
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L, false);;
Set<String> permissions = mallUserInfoService.getUserPermissions(user);
Map map = new HashMap<>();
map.put("menuList", menuList);
map.put("permissions", permissions);
return new ResultData(map);
}

@ApiOperation("添加菜单/权限")


Загрузка…
Отмена
Сохранить