fengji

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -13,6 +13,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.Payment;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +56,10 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
 
     @Override
     public PageInfo<TenantOrderRecord> queryPage(TenantOrderRecordDto dto) {
+        Integer tenantId = TenantContextHolder.getTenantId();
+        if (dto.getTenantId() == null) {
+            dto.setTenantId(tenantId.toString());
+        }
         Page<TenantOrderRecord> pageInfo = PageUtil.getPage(dto.getPage(), dto.getRows());
         pageInfo.setDesc("a.created_time_ ");
         WrapperUtil.toListOptional(dto.getTenantId())

mec-biz/src/main/resources/config/mybatis/TenantOrderRecordMapper.xml

@@ -54,6 +54,7 @@
                 LEFT JOIN tenant_info AS b
                           ON a.tenant_id_ = b.id_
     <where>
+        a.tenant_id_ = #{tenantId}
         <if test="param.orderNo != null ">
             AND a.`order_no_` = #{param.orderNo}
         </if>
@@ -66,12 +67,13 @@
         <if test="param.orderState != null ">
             AND a.`order_state_` = #{param.orderState}
         </if>
-        <if test="param.tenantIdList != null ">
-            AND a.`tenant_id_`  IN
-            <foreach collection="param.tenantIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+<!--        前端去掉 tenantId 搜索 -->
+<!--        <if test="param.tenantIdList != null ">-->
+<!--            AND a.`tenant_id_`  IN-->
+<!--            <foreach collection="param.tenantIdList" item="id" open="(" close=")" separator=",">-->
+<!--                #{id}-->
+<!--            </foreach>-->
+<!--        </if>-->
         <if test="param.startDate != null">
             AND a.`created_time_` <![CDATA[ >= ]]>  #{param.startDate}
         </if>