Commit 03e40829 by guojuxing

日志筛选数据,进行权限控制

parent 210e97f3
......@@ -174,9 +174,10 @@ public class MenuController {

 */
@RequestMapping("/list-log-menu-tree")
public RestResponse listMenuPageTree() {
MenuListQO params = new MenuListQO();
params.setMenuType(MenuTypeEnum.PAGE.getCode());
ServiceResponse<List<MenuDTO>> result = menuApiService.listMenuTree(params);
UserDetail userDetail = UserDetailUtils.getUserDetail();
//权限控制
ServiceResponse<List<MenuDTO>> result = menuApiService.getUserMenuOfGic(userDetail.getEnterpriseId(),
userDetail.getUserId(), null, userDetail.getEnterpriseInfo().getVersionCode());
if (result.isSuccess()) {
return RestResponse
.success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
......@@ -186,8 +187,15 @@ public class MenuController {
@RequestMapping("/list-log-app-menu-tree")
public RestResponse listMenuAppPageTree() {
ServiceResponse<List<MenuDTO>> result = menuApiService
.listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
UserDetail userDetail = UserDetailUtils.getUserDetail();
boolean isSuperAdmin = userDetail.getUserInfo().getSuperAdmin().intValue() == 1;
ServiceResponse<List<MenuDTO>> result;
if (isSuperAdmin) {
result = menuApiService.listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
} else {
//权限控制
result = menuApiService.getUserMenuOfApp(userDetail.getEnterpriseId(), userDetail.getUserId(), null, null);
}
if (result.isSuccess()) {
return RestResponse
.success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
......@@ -217,6 +225,8 @@ public class MenuController {
searchParam.setInterfaceName(search);
if (menuId != null) {
searchParam.setRelationId(Long.valueOf(menuId));
} else {
//权限控制
}
SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
if (StringUtils.isNotBlank(startTime)) {
......
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