Merge remote-tracking branch 'origin/test'

张志伟
2 parents a24522dd aad5fd0f
Showing 2 changed files with 10 additions and 0 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowRecordMapper.xml
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/query/FollowRecordPoolQuery.java
@@ -113,6 +113,9 @@
             <if test="condition.frameNo != null and condition.frameNo !='' ">
                 and t3.frame_no like concat('%', #{condition.frameNo}, '%')
             </if>
+            <if test="condition.bizId != null and condition.bizId !='' ">
+                and t1.bizId = #{condition.bizId}
+            </if>
             <if test="condition.type !=null">
                 and t1.type = #{condition.type}
             </if>
@@ -185,6 +188,9 @@
             <if test="condition.frameNo != null and condition.frameNo !='' ">
                 and t3.frame_no like concat('%', #{condition.frameNo}, '%')
             </if>
+            <if test="condition.bizId != null and condition.bizId !='' ">
+                and t1.bizId = #{condition.bizId}
+            </if>
             <if test="condition.type !=null">
                 and t1.type = #{condition.type}
             </if>
@@ -51,6 +51,10 @@ public class FollowRecordPoolQuery extends PoolQuery {
     private Boolean owner;
     private String startTime;
     /**
+     * 业务id 【活动编号等 全匹配】
+     */
+    private String bizId;
+    /**
      * 数据时间 【查询时精确到月份】
      * 无时间是默认当天数据
      */