From 7bb06e7fdc88368dd47a0006d31b5454277bc9c1 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 16 Jun 2022 10:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java | 1 + .../promotion/serviceimpl/PromotionGoodsServiceImpl.java | 2 +- .../cn/lili/controller/permission/MenuManagerController.java | 1 - .../main/java/cn/lili/security/ManagerAuthenticationFilter.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java index 9557ceaec..8e062fd46 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java @@ -88,6 +88,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me if (CharSequenceUtil.isNotEmpty(menu.getId())) { } + cache.vagueDel(CachePrefix.USER_MENU.getPrefix(UserEnums.MANAGER)); return this.saveOrUpdate(menu); } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index 98852a25d..1eda7644c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -314,7 +314,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl promotionInfo) { - JSONObject promotionsObj = JSONUtil.parseObj(promotionInfo); + JSONObject promotionsObj = JSONUtil.parseObj(promotionInfo.getValue()); PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams(); searchParams.setSkuId(dataSku.getId()); searchParams.setPromotionId(promotionsObj.get("id").toString()); diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index 6c7c478b4..73e3b1cfc 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -53,7 +53,6 @@ public class MenuManagerController { @ApiImplicitParam(name = "id", value = "菜单ID", required = true, paramType = "path", dataType = "String") @ApiOperation(value = "编辑") @PutMapping(value = "/{id}") - @DemoSite public ResultMessage edit(@PathVariable String id, Menu menu) { menu.setId(id); diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java index 27a1586f6..ddd981cb2 100755 --- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java @@ -84,7 +84,7 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter { //如果不是超级管理员， 则鉴权 - if (!authUser.getIsSuper()) { + if (Boolean.FALSE.equals(authUser.getIsSuper())) { //获取缓存中的权限 Map> permission = (Map>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId());