Merge remote-tracking branch 'origin/master'

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallSonQueryRequestDTO.java

 package cn.com.taiji.userw.dto.serviceHall;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Data
 public class ServiceHallSonQueryRequestDTO extends AbstractStaffBizRequestDTO {
 //    private String servicehallId;
+
+    @ApiModelProperty(value = "渠道编号")
+    @NotBlank(message = "渠道编号不能为空")
+    private String agencyId;
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManagerImpl.java

 
     @Override
     public List<ServiceHallSonQueryModel> querySon(ServiceHallSonQueryRequestDTO reqDto) {
-        List<QtkServiceHall> all = serviceHallRepo.findAll();
+        List<QtkServiceHall> all = serviceHallRepo.listByAgencyId(reqDto.getAgencyId());
         if (CollectionUtil.isEmpty(all)) return null;
         List<QtkServiceHall> top = new ArrayList<>();//最顶级的网点
         List<QtkServiceHall> son = new ArrayList<>();//子网点