fix

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

@@ -193,12 +193,15 @@ public class CmsOrderController {
 				//4.用户权益订单
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
-			if (otherOrderType == 5) {
+			if (otherOrderType == 6) {
 				//5.加盟订单
 				builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
 			}
 		}
 		if (userMirrorShopId != null) {
+			if (StrUtil.isNotEmpty(conditionSql)) {
+				conditionSql += " and ";
+			}
 			conditionSql += String.format(" exists (select 1 from user_mirror_shop_order_relate umr where mp_id = %s and umr.order_id = o.id limit 1)", userMirrorShopId);
 		}
 		if (StrUtil.isNotBlank(conditionSql)) {
@@ -386,7 +389,7 @@ public class CmsOrderController {
 				//4.用户权益订单
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
-			if (otherOrderType == 5) {
+			if (otherOrderType == 6) {
 				//5.加盟订单
 				builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
 			}