caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!192 优化代码，修复bug

Browse Source 
Merge pull request !192 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-06-16 02:22:47 +00:00 committed by Gitee
commit b361e46fb7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java
View File

@ -88,6 +88,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
if (CharSequenceUtil.isNotEmpty(menu.getId())) {
}
cache.vagueDel(CachePrefix.USER_MENU.getPrefix(UserEnums.MANAGER));
return this.saveOrUpdate(menu);
}

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
View File

@ -314,7 +314,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
}
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());

1
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@ -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<Menu> edit(@PathVariable String id, Menu menu) {
menu.setId(id);

2
manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
View File

@ -84,7 +84,7 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter {
//如果不是超级管理员， 则鉴权
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());