Merge branch 'fixbug_1024' into developer

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -10,6 +11,7 @@ import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.ExcelUtils;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.enterprise.api.service.StoreWidgetService;
@@ -407,6 +409,27 @@ public class StaffController extends WebBaseController {
     }
 
     /**
+     * 是否展示区经 true是
+     * @return
+     */
+    @RequestMapping("hasManagerFlag")
+    public RestResponse hasManagerFlag() {
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+        if (CollectionUtil.isEmpty(list)) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_10010.getCode()),HaoBanErrCode.ERR_10010.getMsg());
+        }
+        List<String> enterpriseIds = list.stream().filter(dto -> {
+            boolean over = wxEnterpriseApiService.enterpriseIsOver(dto.getEnterpriseId());
+            return !over;
+        }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
+        List<ClerkDTO> clerkDTOList = clerkService.listClerkEnableHaoban(enterpriseIds, null);
+        boolean flag = CollectionUtils.isNotEmpty(clerkDTOList);
+        return RestResponse.successResult(flag);
+    }
+
+    /**
      * @return 返回值类型: <pre>
      * @author 作者: qwm
      * @date 时间: 2020年12月18日 上午11:11:35 <pre>