Merge branch 'master-modify-background-bug-hf'

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java

@@ -65,6 +65,10 @@ public class AppUserManageDTO {
      */
     private Integer userId;
 
+	/**
+	 * 真实姓名
+	 */
+	private String realName;
 //    /**
 //     * 接收前台时间范围
 //     */

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -190,7 +190,10 @@
             and d.source = #{source}
         </if>
         <if test="userId!=null">
-           and  l.id=#{userId}
+            and  l.id=#{userId}
+        </if>
+        <if test="realName !=null and  realName != ''">
+           and  d.realname like CONCAT('%',#{realName},'%')
         </if>
         <if test="citySet != null ">
             and d.city_code in

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -130,7 +130,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                         return false;
                     }
 
-                    if (e.getStatus() == 4) {
+                    if (e.getStatus() == 4||e.getStatus() == 5) {
                         value.setShowType(2);
                         return false;
                     }
@@ -151,11 +151,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public void updateCrossRecord(OrderVehicleCrosstownDto value) {
         if (value.getOrperaterId() != null) {
-            ObjectRestResponse<AppUserDTO> objectRestResponse = userFeign.userDetailById(value.getOrperaterId());
-            if (objectRestResponse.getData() != null) {
-                AppUserDTO data = objectRestResponse.getData();
-                value.setUsername(data.getNickname());
-                value.setOperatorName(data.getRealname());
+            ObjectRestResponse<UserDTO> userDTOObjectRestResponse = userFeign.userinfoByUid(value.getOrperaterId());
+            log.info("操作人用户信息:{}",userDTOObjectRestResponse.getData());
+            if (userDTOObjectRestResponse.getData() != null) {
+                UserDTO data = userDTOObjectRestResponse.getData();
+//                value.setUsername(data.getNickname());
+//                value.setOperatorName(data.getRealname());
                 value.setOperatorPhone(data.getUsername());
                 value.setOperatorTime(value.getCrtTime());
             }

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

@@ -230,7 +230,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     }
 
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
-                        log.info("本人驾驶,驾驶人id:{}",orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
+                        log.info("自己司机,驾驶人id:{}",orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
                         try {
                             List<VehicleUserLicense> orderUserLicenses = vehicleFeign.getVehicleLicenseList(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds()).getData();
                             log.info("驾驶人信息:{}",orderUserLicenses);