..
This commit is contained in:
@@ -3,9 +3,11 @@ package com.budwk.app.sys.controller.v4;
|
|||||||
import cn.dev33.satoken.annotation.SaCheckLogin;
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.budwk.app.base.result.Result;
|
import com.budwk.app.base.result.Result;
|
||||||
|
import com.budwk.app.sys.models.Sys_menu;
|
||||||
import com.budwk.app.sys.models.Sys_module;
|
import com.budwk.app.sys.models.Sys_module;
|
||||||
import com.budwk.app.sys.models.Sys_user_favorite_app;
|
import com.budwk.app.sys.models.Sys_user_favorite_app;
|
||||||
import com.budwk.app.sys.services.SysMenuService;
|
import com.budwk.app.sys.services.SysMenuService;
|
||||||
|
import com.budwk.app.sys.services.SysUserService;
|
||||||
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
|
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
@@ -37,6 +39,8 @@ public class SysV4AppsController {
|
|||||||
private Dao dao;
|
private Dao dao;
|
||||||
@Inject
|
@Inject
|
||||||
private SysMenuService sysMenuService;
|
private SysMenuService sysMenuService;
|
||||||
|
@Inject
|
||||||
|
private SysUserService sysUserService;
|
||||||
|
|
||||||
@At("/categories")
|
@At("/categories")
|
||||||
@Ok("json")
|
@Ok("json")
|
||||||
@@ -59,6 +63,7 @@ public class SysV4AppsController {
|
|||||||
@SaCheckLogin
|
@SaCheckLogin
|
||||||
@ApiOperation("获取应用列表")
|
@ApiOperation("获取应用列表")
|
||||||
public Result list(@Param("categoryId") String categoryId, @Param("letter") String letter, @Param("keyword") String keyword, @Param(value = "platform", df = "PC") String platform, HttpServletRequest req) {
|
public Result list(@Param("categoryId") String categoryId, @Param("letter") String letter, @Param("keyword") String keyword, @Param(value = "platform", df = "PC") String platform, HttpServletRequest req) {
|
||||||
|
List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
m.id,
|
m.id,
|
||||||
@@ -80,6 +85,7 @@ public class SysV4AppsController {
|
|||||||
cnd.and("m.platform", "=", platform);
|
cnd.and("m.platform", "=", platform);
|
||||||
cnd.and("m.disabled", "=", false);
|
cnd.and("m.disabled", "=", false);
|
||||||
cnd.and(Cnd.exps("m.parentId", "is", null).or("m.parentId", "=", ""));
|
cnd.and(Cnd.exps("m.parentId", "is", null).or("m.parentId", "=", ""));
|
||||||
|
cnd.and("m.id","in", menus.stream().map(Sys_menu::getId).toArray());
|
||||||
cnd.andEX("m.moduleId", "=", categoryId);
|
cnd.andEX("m.moduleId", "=", categoryId);
|
||||||
cnd.asc("m.location");
|
cnd.asc("m.location");
|
||||||
if (StrUtil.isNotBlank(keyword)) {
|
if (StrUtil.isNotBlank(keyword)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user