解决冲突

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -135,6 +135,9 @@
 			SELECT a.* FROM business_insurance_policy a LEFT JOIN business_application_policy b ON a.id_ = b.policy_id
 		]]>
         <where>
+            <if test="searchParams.delFlag != null">
+                and a.del_flag = #{searchParams.delFlag}
+            </if>
             <if test="searchParams.applicationId != null">
                 and b.application_id like #{searchParams.applicationId}
             </if>