Merge branch 'feature-recommend2' into 'master'

配置

See merge request !2924

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -308,7 +308,7 @@ public class WxStaffController extends WebBaseController {
      */
     @IgnoreLogin
     @RequestMapping("/get-user-setting")
-    public HaobanResponse getUserSetting(String wxEnterpriseId, String staffId) {
+    public HaobanResponse getUserSetting(String wxEnterpriseId, String staffId,String enterpriseId) {
         if (StringUtils.isAnyBlank(wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
@@ -354,7 +354,11 @@ public class WxStaffController extends WebBaseController {
 
         auditSettingVO.setShowAiCustom(this.aiCustom(storeDTO.getEnterpriseId()));
 
-        auditSettingVO.setPotentialHide(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID.contains(wxEnterpriseDTO.getEnterpriseId()) ? 1 : 0);
+        int potentialHide = StringUtils.isNotBlank(MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID)
+                && StringUtils.isNotBlank(enterpriseId)
+                && MarketingSwitcher.POTENTIAL_HIDE_STORE_ENTERPRISE_ID.contains(enterpriseId)
+                ? 1 : 0;
+        auditSettingVO.setPotentialHide(potentialHide);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }