Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -426,6 +426,12 @@
             <if test="costParam.costRules != null and costParam.costRules != ''">
                 AND pc.cost_describe like concat('%',#{costParam.costRules},'%')
             </if>
+            <if test="costParam.costRulesList != null and costParam.costRulesList.size() > 0">
+                AND
+                <foreach collection="costParam.costRulesList" item="keyword" separator="AND">
+                    pc.cost_describe LIKE CONCAT('%', #{keyword}, '%')
+                </foreach>
+            </if>
             <if test="costParam.agreementStatus != null and costParam.agreementStatus != ''">
                 AND pc.is_enabled = #{costParam.agreementStatus}
             </if>