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

# 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,12 @@ public class AppUserManageDTO {
      */
     private Integer userId;
 
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+
 //    /**
 //     * 接收前台时间范围
 //     */

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

@@ -141,7 +141,8 @@
         base_user_member_level ml
         on
         ml.level = b.member_level
-        where ml.isdel = 0
+        where
+        ml.isdel=0
         ) m
         on
         l.id = m.user_id
@@ -191,6 +192,9 @@
         <if test="userId!=null">
            and  l.id=#{userId}
         </if>
+        <if test=" realname !=null  realname != ''">
+            d.realname like  CONCAT('%',#{realname},'%')
+        </if>
         <if test="citySet != null ">
             and d.city_code in
             <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" >

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

@@ -150,9 +150,10 @@ 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();
+            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());

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);