Commit a57c79b9 authored by jiaorz's avatar jiaorz

网关日志限制修改

parent 149a94eb
...@@ -301,7 +301,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -301,7 +301,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
Integer page; Integer page;
@ApiModelProperty("每页限制") @ApiModelProperty("每页限制")
Integer limit; Integer limit;
/**
* 会员等级
*/
Integer memberLevel;
List<Integer> companyIds; List<Integer> companyIds;
} }
......
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
from base_order b from base_order b
LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
LEFT JOIN order_tour_detail t on t.order_id = b.id LEFT JOIN order_tour_detail t on t.order_id = b.id
LEFT JOIN order_member_detail on m.order_id = b.id
<where> <where>
<if test="crtUser != null"> <if test="crtUser != null">
and b.crt_user = #{crtUser} and b.crt_user = #{crtUser}
...@@ -128,6 +129,9 @@ ...@@ -128,6 +129,9 @@
<if test="type != null"> <if test="type != null">
and b.type = #{type} and b.type = #{type}
</if> </if>
<if test="memberLevel != null and memberLevel != ''">
and m.member_level = #{memberLevel}
</if>
<if test="no != null and no != '' "> <if test="no != null and no != '' ">
and no like CONCAT ("%", #{no}, "%") and no like CONCAT ("%", #{no}, "%")
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment