fix：审核绑定

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

@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class AuditApiServiceImpl implements AuditApiService {
-    
+
     private static final Logger logger = LogManager.getLogger(AuditApiService.class);
 
     @Autowired
@@ -68,19 +68,19 @@ public class AuditApiServiceImpl implements AuditApiService {
     @Autowired
     private ClerkService clerkService;
     @Autowired
-    private PowerService powerService ;
+    private PowerService powerService;
     @Autowired
-    private StoreWidgetService storeWidgetService ; 
+    private StoreWidgetService storeWidgetService;
 
     @Override
     public Page<AuditDTO> page(Integer auditType, String search, String wxEnterpriseId,
-                               String enterpriseId, Integer auditStatus, Integer auditFlag, BasePageInfo pageInfo , String clerkId) {
-        List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId) ;
+                               String enterpriseId, Integer auditStatus, Integer auditFlag, BasePageInfo pageInfo, String clerkId) {
+        List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId);
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
         com.github.pagehelper.Page<TabHaobanAudit> page = new com.github.pagehelper.Page<TabHaobanAudit>();
-        page = auditMapper.page(wxEnterpriseId,auditType, storeIdList, search, enterpriseId, auditStatus, auditFlag);
+        page = auditMapper.page(wxEnterpriseId, auditType, storeIdList, search, enterpriseId, auditStatus, auditFlag);
         if (CollectionUtil.isNotEmpty(page.getResult())) {
-            List<String> commitStaffIds = page.getResult().stream().filter(item->StringUtils.isBlank(item.getCommitStaffName())).map(s -> s.getCommitStaffId()).collect(Collectors.toList());
+            List<String> commitStaffIds = page.getResult().stream().filter(item -> StringUtils.isBlank(item.getCommitStaffName())).map(s -> s.getCommitStaffId()).collect(Collectors.toList());
             logger.info(JSON.toJSONString(commitStaffIds));
             if (CollectionUtil.isNotEmpty(commitStaffIds)) {
                 List<TabHaobanStaff> staffList = staffMapper.listByIds(commitStaffIds);
@@ -166,6 +166,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 staffClerkRelation.setStoreId(tab.getCommitStoreId());
                 staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
                 staffClerkRelation.setStaffId(obj.getStaffId());
+                staffClerkRelation.setManageFlag(clerkDTO.getClerkType() == 2 ? 1 : 0);
                 ServiceResponse serviceResponse = staffClerkRelationApiService.wxBindStaffClerk(staffClerkRelation, optStaffId, ChannelCodeEnum.AUDIT_BIND.getCode());
                 if (!serviceResponse.isSuccess()) {
                     return serviceResponse.getMessage();
@@ -206,7 +207,7 @@ public class AuditApiServiceImpl implements AuditApiService {
             if (StringUtils.isNotBlank(batchId)) {
                 insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
             }
-            staffClerkRelationApiService.unbindByStaffAndClerkId(optStaffId,obj.getClerkId(),ChannelCodeEnum.AUDIT_UNBIND.getCode());
+            staffClerkRelationApiService.unbindByStaffAndClerkId(optStaffId, obj.getClerkId(), ChannelCodeEnum.AUDIT_UNBIND.getCode());
             staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(), tab.getCommitStoreId(), 1, "");
         } else if (auditType == AuditType.CLERK_UNBIND.getCode()) {
             //解绑申请，无需审核，直接通过
@@ -268,8 +269,8 @@ public class AuditApiServiceImpl implements AuditApiService {
         tab.setCommitStaffImg(staff.getHeadImg());
         tab.setCommitStaffName(staff.getStaffName());
         tab.setCommitStoreId(commitStoreId);
-        StoreDTO store =this.storeService.getStore(commitStoreId) ;
-        if(null != store) {
+        StoreDTO store = this.storeService.getStore(commitStoreId);
+        if (null != store) {
             tab.setCommitStoreName(store.getStoreName());
         }
         tab.setCommitTime(new Date());
@@ -454,30 +455,30 @@ public class AuditApiServiceImpl implements AuditApiService {
         List<TabHaobanAudit> list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber);
         return !CollectionUtil.isEmpty(list);
     }
-    
+
     @Override
-    public int getAuditCount(String wxEnterpriseId, String enterpriseId , String clerkId) {
+    public int getAuditCount(String wxEnterpriseId, String enterpriseId, String clerkId) {
         // 如果null,说明是所有门店
-        List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId) ;
-        return this.auditMapper.getAuditCount(wxEnterpriseId,enterpriseId, storeIdList) ;
+        List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId);
+        return this.auditMapper.getAuditCount(wxEnterpriseId, enterpriseId, storeIdList);
     }
-    
+
     @SuppressWarnings("unchecked")
-    public List<String> getStoreIdList(String enterpriseId , String clerkId) {
-        EnterpriseSettingDTO enterpriseSetting =  enterpriseService.getEnterpriseSettingByEnterpriseId(enterpriseId) ;
-        logger.info("门店权限,getEnableAccessControl={},{}",enterpriseSetting.getEnableAccessControl(),enterpriseId);
+    public List<String> getStoreIdList(String enterpriseId, String clerkId) {
+        EnterpriseSettingDTO enterpriseSetting = enterpriseService.getEnterpriseSettingByEnterpriseId(enterpriseId);
+        logger.info("门店权限,getEnableAccessControl={},{}", enterpriseSetting.getEnableAccessControl(), enterpriseId);
         if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
-            String storeWidgetKey = this.powerService.getStoreWidgetId(new Date() , clerkId) ;
-            logger.info("权限控制-启用,创建人管辖门店的组件={}",storeWidgetKey);
-            StoreWidgetDTO widget = this.storeWidgetService.getStoreWidgetBykey(storeWidgetKey) ;
-            if(null == widget || widget.getSelectType()==0) {
-                logger.info("权限控制-启用,超管={}",clerkId);
-                return null ;
+            String storeWidgetKey = this.powerService.getStoreWidgetId(new Date(), clerkId);
+            logger.info("权限控制-启用,创建人管辖门店的组件={}", storeWidgetKey);
+            StoreWidgetDTO widget = this.storeWidgetService.getStoreWidgetBykey(storeWidgetKey);
+            if (null == widget || widget.getSelectType() == 0) {
+                logger.info("权限控制-启用,超管={}", clerkId);
+                return null;
             }
-            List<String> storeIdList = new ArrayList<>() ;
-            storeIdList.add("-1-1") ;
+            List<String> storeIdList = new ArrayList<>();
+            storeIdList.add("-1-1");
             Page<StoreDTO> page = new Page<StoreDTO>(1, Integer.MAX_VALUE);
-            page = storeWidgetService.getStoreWidgetStore(storeWidgetKey , null, enterpriseId, page);
+            page = storeWidgetService.getStoreWidgetStore(storeWidgetKey, null, enterpriseId, page);
             if (page != null && CollectionUtils.isNotEmpty(page.getResult())) {
                 List<StoreDTO> list = page.getResult();
                 if (CollectionUtils.isNotEmpty(list)) {
@@ -486,9 +487,9 @@ public class AuditApiServiceImpl implements AuditApiService {
                     }
                 }
             }
-            return storeIdList ;
+            return storeIdList;
         }
-        return null ;
+        return null;
     }
 
 }