fix order source

master
luoyang 5 years ago
parent dbad89e3ab
commit 186c1d6494

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.3.17</version> <version>1.3.18</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

@ -530,7 +530,11 @@
<foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan} <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
</foreach> </foreach>
</if> </if>
<if test="source != 'ALL'"> <if test="source==null">
AND
o.source != 'system'
</if>
<if test="source!=null and source != 'ALL'">
AND AND
o.source = #{source} o.source = #{source}
</if> </if>

Loading…
Cancel
Save