|
@@ -83,7 +83,7 @@ public class SysPermissionController {
|
|
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
|
|
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
|
|
query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
query.orderByAsc(SysPermission::getSortNo);
|
|
query.orderByAsc(SysPermission::getSortNo);
|
|
-
|
|
|
|
|
|
+
|
|
//支持通过菜单名字,模糊查询
|
|
//支持通过菜单名字,模糊查询
|
|
if(oConvertUtils.isNotEmpty(sysPermission.getName())){
|
|
if(oConvertUtils.isNotEmpty(sysPermission.getName())){
|
|
query.like(SysPermission::getName, sysPermission.getName());
|
|
query.like(SysPermission::getName, sysPermission.getName());
|
|
@@ -207,7 +207,7 @@ public class SysPermissionController {
|
|
|
|
|
|
// /**
|
|
// /**
|
|
// * 查询用户拥有的菜单权限和按钮权限(根据用户账号)
|
|
// * 查询用户拥有的菜单权限和按钮权限(根据用户账号)
|
|
-// *
|
|
|
|
|
|
+// *
|
|
// * @return
|
|
// * @return
|
|
// */
|
|
// */
|
|
// @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
|
|
// @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
|
|
@@ -246,7 +246,7 @@ public class SysPermissionController {
|
|
//添加首页路由
|
|
//添加首页路由
|
|
//update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
//update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
if(!PermissionDataUtil.hasIndexPage(metaList)){
|
|
if(!PermissionDataUtil.hasIndexPage(metaList)){
|
|
- SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"首页")).get(0);
|
|
|
|
|
|
+ SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"我的任务")).get(0);
|
|
metaList.add(0,indexMenu);
|
|
metaList.add(0,indexMenu);
|
|
}
|
|
}
|
|
//update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
//update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
@@ -259,7 +259,7 @@ public class SysPermissionController {
|
|
//update-end--Author:zyf Date:20220425 for:自定义首页地址 LOWCOD-1578
|
|
//update-end--Author:zyf Date:20220425 for:自定义首页地址 LOWCOD-1578
|
|
|
|
|
|
if(roleIndex!=null){
|
|
if(roleIndex!=null){
|
|
- List<SysPermission> menus = metaList.stream().filter(sysPermission -> "首页".equals(sysPermission.getName())).collect(Collectors.toList());
|
|
|
|
|
|
+ List<SysPermission> menus = metaList.stream().filter(sysPermission -> "我的任务".equals(sysPermission.getName())).collect(Collectors.toList());
|
|
//update-begin---author:liusq ---date:2022-06-29 for:设置自定义首页地址和组件----------
|
|
//update-begin---author:liusq ---date:2022-06-29 for:设置自定义首页地址和组件----------
|
|
String component = roleIndex.getComponent();
|
|
String component = roleIndex.getComponent();
|
|
String routeUrl = roleIndex.getUrl();
|
|
String routeUrl = roleIndex.getUrl();
|
|
@@ -273,7 +273,7 @@ public class SysPermissionController {
|
|
}
|
|
}
|
|
//update-end---author:liusq ---date:2022-06-29 for:设置自定义首页地址和组件-----------
|
|
//update-end---author:liusq ---date:2022-06-29 for:设置自定义首页地址和组件-----------
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
JSONObject json = new JSONObject();
|
|
JSONObject json = new JSONObject();
|
|
JSONArray menujsonArray = new JSONArray();
|
|
JSONArray menujsonArray = new JSONArray();
|
|
this.getPermissionJsonArray(menujsonArray, metaList, null);
|
|
this.getPermissionJsonArray(menujsonArray, metaList, null);
|
|
@@ -299,7 +299,7 @@ public class SysPermissionController {
|
|
json.put("sysSafeMode", jeecgBaseConfig.getSafeMode());
|
|
json.put("sysSafeMode", jeecgBaseConfig.getSafeMode());
|
|
result.setResult(json);
|
|
result.setResult(json);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- result.error500("查询失败:" + e.getMessage());
|
|
|
|
|
|
+ result.error500("查询失败:" + e.getMessage());
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|