|
|
@@ -5,9 +5,11 @@ import com.platform.entity.SysMenuEntity;
|
|
|
import com.platform.service.SysMenuService;
|
|
|
import com.platform.utils.*;
|
|
|
import com.platform.utils.Constant.MenuType;
|
|
|
+import com.platform.vos.CurrentUserLoginVo;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.util.ObjectUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
@@ -156,7 +158,8 @@ public class SysMenuController extends AbstractController {
|
|
|
@RequestMapping("/user")
|
|
|
public R user() {
|
|
|
List<SysMenuEntity> menuList = sysMenuService.getUserMenuList(getUserId());
|
|
|
- if(getUser().getIsPlatformStreamer()){
|
|
|
+ CurrentUserLoginVo user = getUser();
|
|
|
+ if(!ObjectUtils.isEmpty(user.getIsPlatformStreamer()) && user.getIsPlatformStreamer()){
|
|
|
menuList.removeIf(menu->menu.getName().equals("商品管理"));
|
|
|
}
|
|
|
return R.ok().put("menuList", menuList);
|
