Merge branch 'master' into pre

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -1017,7 +1017,11 @@ public class CmsOrderController {
 		if (userId == null || userId == 0) {
 			return GatewayResponse.SUCCESS.newBuilder().toResult();
 		}
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		List<Long> userIdList = null;
+		try {
+			userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		} catch (Exception e) {
+		}
 		String userIds = null;
 		if (CollUtil.isNotEmpty(userIdList)) {
 			userIds = userIdList.toString().replaceAll("\\[", "").replaceAll("]", "");
@@ -1040,7 +1044,15 @@ public class CmsOrderController {
 		if (userId == null || userId == 0) {
 			return GatewayResponse.SUCCESS.newBuilder().toResult();
 		}
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		List<Long> userIdList = null;
+		try {
+			userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		} catch (Exception e) {
+		}
+		if (userIdList == null) {
+			userIdList = new ArrayList<>();
+			userIdList.add(userId);
+		}
 		SearchResult<OrderDonUserRefundDetailView.OrderDonDetailView> search = beanSearcher.search(OrderDonUserRefundDetailView.OrderDonDetailView.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(OrderDonUserRefundDetailView.OrderDonDetailView::getUserId, userIdList).op(Operator.InList)
 				.build());