ross数据查询调整

src/main/resources/mapper/CmBehaciorRecordDao.xml

@@ -60,10 +60,11 @@
                 AND spName = #{spName}
             </if>
             <if test="relevanceShop != null and relevanceShop != ''">
-                AND relevanceShop like concat('%',#{relevanceShop},'%')
-                <if test="behaviorType == 2">
-                    or behaviorType = #{behaviorType}
-                </if>
+                AND (relevanceShop like concat('%',#{relevanceShop},'%')
+                    <if test="behaviorType == 2">
+                        or behaviorType = #{behaviorType}
+                    </if>
+                    )
             </if>
             <if test="labels != null and labels.size > 0">
                 AND
@@ -127,9 +128,6 @@
             </if>
             <if test="relevanceShop != null and relevanceShop != ''">
                 AND relevanceShop like concat('%',#{relevanceShop},'%')
-                <if test="behaviorType == 2">
-                    or behaviorType = #{behaviorType}
-                </if>
             </if>
             <if test="labels != null and labels.size > 0">
                 AND