diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index b3107fc10..0975d0a22 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -1514,7 +1514,7 @@ public class TempService {
                 throw new RuntimeException("订单不是异常订单：" + orderCode);
             }
 
-            if (!Objects.equals(orderBasicInfo.getPayMode(), PayModeEnum.PAYMENT_OF_WHITELIST.getValue())) {
+            if (!Objects.equals(orderBasicInfo.getPayMode(), "3")) {
                 throw new RuntimeException("订单不是白名单支付方式：" + orderCode);
             }
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
index 17391761e..4a364c152 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
@@ -642,11 +642,26 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
 		List<String> merchantIdList = merchantInfoVOList.stream()
 				.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
 
+		List<String> queryMerchantIds;
+
+		// 权限校验一下
+		if (StringUtils.isNotBlank(dto.getMerchantId())) {
+			if (!merchantIdList.contains(dto.getMerchantId())) {
+				throw new BusinessException("403", "没有权限查询该运营商数据");
+			}
+			// 只查当前筛选的运营商
+			queryMerchantIds = Collections.singletonList(dto.getMerchantId());
+		} else {
+			// 查全部权限内的运营商
+			queryMerchantIds = merchantIdList;
+		}
+
 		// 分页
 		int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
 		int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
 		PageHelper.startPage(pageNum, pageSize);
-		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
+		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(queryMerchantIds, dto);
+
 		if (CollectionUtils.isNotEmpty(resultList)) {
 			for (MerchantVipVO merchantVipVO : resultList) {
 				BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance();