111

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

@@ -25,6 +25,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StoreDetailDTO;
+import com.gic.enterprise.api.dto.StoreVo;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -34,6 +35,7 @@ import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.AuditDTO;
 import com.gic.haoban.manage.api.dto.AuditStaffDTO;
 import com.gic.haoban.manage.api.dto.BatchAuditLogDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.dto.StoreAddressDTO;
@@ -44,6 +46,7 @@ import com.gic.haoban.manage.api.enums.StoreFieldEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
@@ -93,7 +96,8 @@ public class AuditApiServiceImpl implements AuditApiService{
 	private StaffClerkRelationApiService staffClerkRelationApiService;
 	@Autowired
 	private ClerkService clerkService;
-	
+	@Autowired
+	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	@Override
 	public Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,
 			String enterpriseId,Integer auditStatus,Integer auditFlag, BasePageInfo pageInfo) {
@@ -102,13 +106,27 @@ public class AuditApiServiceImpl implements AuditApiService{
 		List<String> staffIds = new ArrayList<>();
 		List<String> storeIds = new ArrayList<>();
 		if(StringUtils.isNotEmpty(search)){
-			
-			List<StoreDTO> list = storeService.searchStoreByCodeOrName(enterpriseId,search);
+			//获取企业列表
+			List<String> enterpriseIds = new ArrayList<>();
+			if(StringUtils.isEmpty(enterpriseId)){
+				List<EnterpriseDetailDTO> enterprises = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+				if(CollectionUtil.isNotEmpty(enterprises)){
+					List<String> searchEnterpriseIds = enterprises.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+					enterpriseIds.addAll(searchEnterpriseIds);
+				}
+			}else{
+				enterpriseIds.add(enterpriseId);
+			}
+			//调gic接口查storeIds
+	        String[] strArray = new String[enterpriseIds.size()];
+	        enterpriseIds.toArray(strArray);
+	        
+			List<StoreVo> list = storeService.queryStoreByName(strArray,search);
 			if(CollectionUtil.isNotEmpty(list)){
 				List<String> storeIds1 = list.stream().map(s->s.getStoreId()).collect(Collectors.toList());
 				storeIds.addAll(storeIds1);
 			}
-			
+			//模糊查staffName
 			List<TabHaobanStaff> staffList = staffMapper.listLikeName(search);
 			if(CollectionUtil.isNotEmpty(staffList)){
 				List<String> staffIds2 = staffList.stream().map(s->s.getStaffId()).collect(Collectors.toList());