商户-客户订单数据隔离

src/main/java/com/mmc/oms/model/qo/uav/UavOrderQO.java

@@ -35,6 +35,9 @@ public class UavOrderQO implements Serializable {
     @ApiModelProperty(value = "商家id", hidden = true)
     private Integer thirdBackUserAccountId;
 
+    @ApiModelProperty(value = "订单类型", hidden = true)
+    private Integer orderType;
+
     @ApiModelProperty(value = "订单是否展示给用户", hidden = true)
     private Integer showUserPort;
 

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -316,6 +316,7 @@ public class UavOrderServiceImpl implements UavOrderService {
     public ResultBody list(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount) {
         if (!currentAccount.getRoleInfo().getSuperAdmin().equals(1)){
             uavOrderQO.setThirdBackUserAccountId(currentAccount.getUserAccountId());
+            uavOrderQO.setOrderType(UavOrderType.SIGN.getCode());
         }
         int count = uavOrderDao.countList(uavOrderQO);
         if (count == 0) {

src/main/resources/mapper/uav/UavOrderDao.xml

@@ -205,6 +205,9 @@
         <if test="thirdBackUserAccountId != null">
             and third_back_user_account_id = #{thirdBackUserAccountId}
         </if>
+        <if test="orderType != null">
+            and uo.order_type = #{orderType}
+        </if>
         <if test="startTime != null">
             and create_time >= #{startTime}
         </if>
@@ -236,6 +239,9 @@
         <if test="thirdBackUserAccountId != null">
             and uo.third_back_user_account_id = #{thirdBackUserAccountId}
         </if>
+        <if test="orderType != null">
+            and uo.order_type = #{orderType}
+        </if>
         <if test="startTime != null">
             and uo.create_time >= #{startTime}
         </if>