子账号全量显示

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserMapper.xml

@@ -22,7 +22,7 @@
         mobile
         FROM kylin_check_user
         <where>
-            merchant_id=#{merchantId} AND `status` = 1
+            `status` = 1
             <if test="mobile !=null and mobile !='' ">
                 AND `mobile` LIKE concat('%', #{mobile}, '%')
             </if>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPerformancesPartnerController.java

@@ -57,9 +57,9 @@ public class KylinCheckUserPerformancesPartnerController {
     public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(@RequestParam("merchantId") @NotNull(message = "商户ID不能为空") String merchantId,
                                                                            @RequestParam("checkUserId") @NotNull(message = "验票用户ID不能为空") String checkUserId,
                                                                            @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
-                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1)int size,
+                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                            @RequestParam("name") String name) {
-        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size, name);
     }
 
     @GetMapping(value = "unRelation")
@@ -70,6 +70,6 @@ public class KylinCheckUserPerformancesPartnerController {
                                                                              @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
                                                                              @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                              @RequestParam("name") String name) {
-        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size, name);
     }
 }