来佣比对查询列表sql报错2

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yd.dal.mapper.lifecommission.LifeCommissionMapper">
 <mapper namespace="com.yd.dal.mapper.lifecommission.LifeCommissionMapper">
     <!--  查询来佣比对列表  -->
     <!--  查询来佣比对列表  -->
-    <select id="queryComeCommissionList" resultType="com.yd.api.commission.vo.lifecommission.ComeCommissionVO">
+    <select id="queryComeCommissionList" parameterType="com.yd.api.commission.vo.lifecommission.QueryComeCommissionListRequestVO"
+            resultType="com.yd.api.commission.vo.lifecommission.ComeCommissionVO">
         select
         select
             o.id orderId,
             o.id orderId,
             o.commission_check_at checkDate,
             o.commission_check_at checkDate,
-            i.name_abbre insurerName,
+            IFNULL(i.name_abbre,i.name) insurerName,
             IFNULL(a.name,p.name) planName,
             IFNULL(a.name,p.name) planName,
             o.policy_no policyNo,
             o.policy_no policyNo,
             o.order_price orderPrice,
             o.order_price orderPrice,
@@ -49,7 +50,7 @@
             </when>
             </when>
             <otherwise>
             <otherwise>
                 <if test="compareDate != null">
                 <if test="compareDate != null">
-                    and o.commission_check_id is null or date_format(f.withdrawable_date, '%Y-%m') &lt;= #{compareDate}
+                    and (o.commission_check_id is null or date_format(f.withdrawable_date, '%Y-%m') &lt;= #{compareDate})
                 </if>
                 </if>
                 <if test="insurerId != null">
                 <if test="insurerId != null">
                     and o.insurer_id = #{insurerId}
                     and o.insurer_id = #{insurerId}