Kaynağa Gözat

Merge branch 'zzy' into test

zhouzeyu@c-top.com.cn 3 yıl önce
ebeveyn
işleme
b7ac42016e

+ 2 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialReportOverViewV3Mapper.xml

@@ -131,8 +131,9 @@
             </if>
 
             <if test='dimension=="designer" and designerId!=null'>
-                and user_id=#{designerId}
+                and (clip_id=#{designerId} or shot_id=#{designerId} or plan_id=#{designerId})
             </if>
+
             AND stat_date &gt;= #{startDate}
             AND stat_date &lt;= #{endDate}
             AND company_id=#{companyId}