he2802 hace 1 año
padre
commit
127d30bb58

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListExportVo.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.order.vo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        <if test="orderFroms != null ">
+        <if test="orderFroms != null and orderFroms.size()!=0">
             AND o.order_from in
             <foreach collection="orderFroms" item="item" index="index" open="(" close=")" separator=",">
                 #{item}