区间督导功能标识

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -70,14 +70,6 @@ public interface WxEnterpriseApiService {
     List<YwWxEnterpriseDTO> listByIds(Set<String> enterpriseIds);
 
     /**
-     * 企业是否过期 true是
-     *
-     * @param enterpriseId
-     * @return
-     */
-    boolean enterpriseIsOver(String enterpriseId);
-
-    /**
      * 获取配置
      *
      * @param wxEnterpriseId

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

@@ -302,12 +302,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         wxEnterpriseService.update(enterpriseDTO);
     }
     
-    // 返回true说明已过期
-    @Override
-    public boolean enterpriseIsOver(String enterpriseId) {
-       return haobanIsStop(enterpriseId) ;
-    }
-
     @Override
     public SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType, String enterpriseId) {
         if (secretType == SecretTypeEnum.MEMBER_WAPP.getVal()) {

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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -12,18 +31,38 @@ 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.EnterpriseSettingDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
-import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.HaobanUserApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxApplicationApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
 import com.gic.haoban.manage.web.vo.ClerkInfoVo;
@@ -31,19 +70,9 @@ import com.gic.haoban.manage.web.vo.StaffExportVO;
 import com.gic.haoban.manage.web.vo.StaffVO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Lists;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 
 
 @RestController
@@ -79,7 +108,7 @@ public class StaffController extends WebBaseController {
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
     @Autowired
-    private StoreWidgetService storeWidgetService;
+    private EnterpriseService enterpriseService;
 
 
     @RequestMapping("set-default-gicenterprise")
@@ -307,7 +336,7 @@ public class StaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10010);
         }
         List<String> enterpriseIds = list.stream().filter(dto -> {
-            boolean over = wxEnterpriseApiService.enterpriseIsOver(dto.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.haobanIsStop(dto.getEnterpriseId());
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
 
@@ -421,11 +450,19 @@ public class StaffController extends WebBaseController {
             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());
+            boolean over = wxEnterpriseApiService.haobanIsStop(dto.getEnterpriseId());
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
-        List<ClerkDTO> clerkDTOList = clerkService.listClerkEnableHaoban(enterpriseIds, null);
-        boolean flag = CollectionUtils.isNotEmpty(clerkDTOList);
+        boolean flag = false ;
+        if(CollectionUtils.isNotEmpty(enterpriseIds)) {
+            for(String eid : enterpriseIds) {
+                EnterpriseSettingDTO enterpriseSetting =  enterpriseService.getEnterpriseSettingByEnterpriseId(eid) ;
+                if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
+                    flag = true ;
+                    break ;
+                }
+            }
+        }
         return RestResponse.successResult(flag);
     }
 

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

@@ -722,7 +722,7 @@ public class WxStaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
-            boolean over = wxEnterpriseApiService.enterpriseIsOver(s.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.haobanIsStop(s.getEnterpriseId());
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
@@ -762,7 +762,7 @@ public class WxStaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
-            boolean over = wxEnterpriseApiService.enterpriseIsOver(s.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.haobanIsStop(s.getEnterpriseId());
             return !over;
         }).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);