fix

sop-business/src/main/resources/mapper/CrmAnalyseMapper.xml

@@ -246,10 +246,12 @@
             <if test="type != null and type != ''">
                 and sc.type = #{type}
             </if>
-            <choose>
-                <when test="supplierId != null and supplierId != ''">and su.id = #{supplierId}</when>
-                <otherwise>and su.id is null and a.id is not null</otherwise>
-            </choose>
+            <if test="supplierId != null and supplierId != ''">
+                and su.id = #{supplierId}
+            </if>
+<!--            <if test="supplierId == null or supplierId = ''">-->
+<!--                and su.id is null-->
+<!--            </if>-->
             <!--            <if test="year != null and year != ''">-->
             <!--                and YEAR ( FROM_UNIXTIME( tbs.start_time / 1000 ))=  #{year}-->
             <!--            </if>-->