Skip to content

H
haoban-manage3.0
Commit 85601bb1 by songyinghui
Options

feat: 素材权限版本调整

parent 2a61e0d0
Showing with 4 additions and 10 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/task/QywxGroupMsgTaskApiServiceImpl.java
...@@ -139,7 +139,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic ...@@ -139,7 +139,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
* @return * @return
*/ */
private ServiceResponse<Void> doHandlerReportInner(Integer reportType) { private ServiceResponse<Void> doHandlerReportInner(Integer reportType) {
List<String> enterpriseIds = groupMessageService.hasMaterialRightEnterprise(MaterialEnterpriseAdaptor.MaterialLevel.HIGH.getCode()); List<String> enterpriseIds = groupMessageService.hasMaterialRightEnterprise(MaterialEnterpriseAdaptor.MaterialLevel.LOW.getCode());
if (CollectionUtils.isEmpty(enterpriseIds)) { if (CollectionUtils.isEmpty(enterpriseIds)) {
return ServiceResponse.success(); return ServiceResponse.success();
} }
...@@ -221,7 +221,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic ...@@ -221,7 +221,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
log.info("当前时间处于消息禁发时间, 忽略{}", cn.hutool.core.date.DateUtil.format(now, "yyyy-MM-dd HH:mm:ss")); log.info("当前时间处于消息禁发时间, 忽略{}", cn.hutool.core.date.DateUtil.format(now, "yyyy-MM-dd HH:mm:ss"));
return ServiceResponse.success(); return ServiceResponse.success();
} }
List<String> enterpriseIds = groupMessageService.hasMaterialRightEnterprise(MaterialEnterpriseAdaptor.MaterialLevel.HIGH.getCode()); List<String> enterpriseIds = groupMessageService.hasMaterialRightEnterprise(MaterialEnterpriseAdaptor.MaterialLevel.LOW.getCode());
if (CollectionUtils.isEmpty(enterpriseIds)) { if (CollectionUtils.isEmpty(enterpriseIds)) {
log.info("开通内容权限的企业为空"); log.info("开通内容权限的企业为空");
return ServiceResponse.success(); return ServiceResponse.success();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
...@@ -536,12 +536,6 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -536,12 +536,6 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
hasExistMenuCodes = new ArrayList<>(); hasExistMenuCodes = new ArrayList<>();
} }
List<String> excludeMenuCodes = hasExistMenuCodes; List<String> excludeMenuCodes = hasExistMenuCodes;
// if (!hasExistMenuCodes.contains("commodityCenter")) {
// // 如果该角色原来没有【商品中心权限】 不勾选发圈素材和素材数量
// logger.info("roleId:{} 原本没有商品中心权限 ", haobanRoleBO.getRoleId());
// excludeMenuCodes.add("goodsDetail_material");
// excludeMenuCodes.add("goodsCenter_Count");
// }
List<TabHaobanRoleMenu> tabHaobanRoleMenus = menuCodes.stream() List<TabHaobanRoleMenu> tabHaobanRoleMenus = menuCodes.stream()
.filter(item -> !excludeMenuCodes.contains(item)) .filter(item -> !excludeMenuCodes.contains(item))
.map(item -> { .map(item -> {
...@@ -569,10 +563,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -569,10 +563,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
static { static {
// 导购 // 导购
menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count")); menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "salesClue", "customerDetail_interact"));
menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain","commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "salesClue", "customerDetail_interact")); menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain","commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "salesClue", "customerDetail_interact"));
// 店长 // 店长
menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage")); menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage", "salesClue", "customerDetail_interact"));
menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage", "salesClue", "customerDetail_interact")); menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage", "salesClue", "customerDetail_interact"));
// 区经 // 区经
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment