!192 优化代码，修复bug

Merge pull request !192 from OceansDeep/feature/pg
hiidea · Jun 16, 2022 · b361e46 · b361e46
2 parents 9f83b40 + 7bb06e7
commit b361e46
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 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
@@ -88,6 +88,7 @@ public boolean saveOrUpdateMenu(Menu menu) {
         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
@@ -314,7 +314,7 @@ public Map<String, Object> getCurrentGoodsPromotion(GoodsSku dataSku, String car
     }
 
     private void setGoodsPromotionInfo(GoodsSku dataSku, Map.Entry<String, Object> 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
@@ -53,7 +53,6 @@ public ResultMessage<Menu> add(Menu menu) {
     @ApiImplicitParam(name = "id", value = "菜单ID", required = true, paramType = "path", dataType = "String")
     @ApiOperation(value = "编辑")
     @PutMapping(value = "/{id}")
-
     @DemoSite
     public ResultMessage<Menu> 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
@@ -84,7 +84,7 @@ private void customAuthentication(HttpServletRequest request, HttpServletRespons
 
 
         //如果不是超级管理员， 则鉴权
-        if (!authUser.getIsSuper()) {
+        if (Boolean.FALSE.equals(authUser.getIsSuper())) {
             //获取缓存中的权限
             Map<String, List<String>> permission = (Map<String, List<String>>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId());
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,7 @@ public boolean saveOrUpdateMenu(Menu menu) { @@
             if (CharSequenceUtil.isNotEmpty(menu.getId())) {
             }
+            cache.vagueDel(CachePrefix.USER_MENU.getPrefix(UserEnums.MANAGER));
             return this.saveOrUpdate(menu);
         }
@@ Expand Down @@