Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -725,10 +725,12 @@
         <where>
             lddl.is_deleted =0
             <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
-            and lddl.id in
+            <if test=" array != null ">
-            <foreach collection="array" item="item" open="(" close=")" separator=",">
+                and lddl.id in
-                #{item}
+                <foreach collection="array" item="item" open="(" close=")" separator=",">
-            </foreach>
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>