Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -223,11 +223,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
           List<Integer> list =  userFeign.getUserIdByUsername(dto.getKeywords());
           if(list != null) {
               userIds.addAll(list);
-          } else {
+          }
+          if(userIds.size() <= 0) {
               return ObjectRestResponse.succ(new PageDataVO<>());
           }
         }
-        dto.setUserIds(userIds);
+
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());