Merge remote-tracking branch 'origin/feature-content2' into feature-content2

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -58,8 +58,7 @@ public enum NoticeMessageTypeEnum {
     CUSTOMER_APPLY_ORDER_REFUND(4005, "客户申请退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_apply_order_refund", "/pages/route/index?pageType=", "hbapp_customer_order_detail"),
     CUSTOMER_SUCCESS_ORDER_REFUND(4006, "客户成功退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_success_order_refund", "/pages/route/index?pageType=", "hbapp_user_bill_detail"),
 
-    // todo pageType
-    MATERIAL_NEW_NOTIFY(6001, "素材上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_new_notify", "/pages/route/index?pageType=", "hbapp_customer_list"),
+    MATERIAL_NEW_NOTIFY(6001, "素材上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_new_notify", "/pages/route/index?pageType=", "hbapp_material_center"),
 
     ;
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -299,16 +299,6 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         return ServiceResponse.success();
     }
 
-//    @Override
-//    public ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag) {
-//        HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, systemFlag);
-//        if (haobanRoleBO == null) {
-//            return ServiceResponse.success();
-//        }
-//        List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
-//        return ServiceResponse.success(menuCodes);
-//    }
-
     @Override
     public ServiceResponse addHaobanRoleInit(String wxEnterpriseId) {
         List<TabHaobanWxEnterpriseRelated> enterpriseRelateds = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);