Merge remote-tracking branch 'origin/saas' into saas

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -62,7 +62,9 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @GetMapping("/finance")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/finance')")
     public HttpResponseResult<PageInfo<StudentPaymentRouteOrderDto>> queryOrderPage(StudentPaymentOrderQueryInfo queryInfo) {
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+    	if(StringUtils.isBlank(queryInfo.getRoutingOrganId())){
+    		queryInfo.setRoutingOrganId(organizationService.getEmployeeOrgan(null));
+    	}
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());