Merge remote-tracking branch 'origin/master'

无关风月

19 小时以前 3de2d31db9ac65c354fd228ab84fa2ed786482b9

 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml

@@ -72,9 +72,9 @@
        LEFT JOIN oa_approval_applications oaa ON oaaai.approval_application_id = oaa.id
        <where>
            oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId}
            <if test="assetIds != null and assetIds.size() > 0">
            <if test="assetMainIds != null and assetMainIds.size() > 0">
                AND oaaai.asset_main_id IN
                <foreach collection="assetIds" item="id" open="(" separator="," close=")">
                <foreach collection="assetMainIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>