Merge remote-tracking branch 'origin/master'

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyMapper.xml

@@ -125,6 +125,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN act_applytask ak ON ak.`task_id` = ah.`id`
             <where>
             ah.apply_status in(1,3)
+            <if test="ids != null">
+                and  ah.id in
+                <foreach item="id" collection="ids" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="searchValue != null ">
             and (
             ah.apply_num like concat('%', #{searchValue}, '%') or
@@ -194,6 +200,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN act_applytask ak ON ak.`task_id` = ah.`id`
             <where>
                 ah.apply_status in(1,3)
+                <if test="ids != null">
+                    and  ah.id in
+                    <foreach item="id" collection="ids" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
                 <if test="searchValue != null ">
                     and (
                     ah.apply_num like concat('%', #{searchValue}, '%') or