BUGfiX 解決忽略冲突后 发布还提示存在冲突的问题

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -182,7 +182,7 @@
                 <foreach collection="blankIds" item="id" open="(" close=")" separator=",">
                     #{id}
                 </foreach>
-                AND (CONFLICTDES is not null or  CONFLICTDES !='' )
+                AND (CONFLICTDES is not null AND  CONFLICTDES !='' )
             </where>
     </select>
 </mapper>