yumeng преди 1 месец
родител
ревизия
c8ff2a7c52

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

@@ -189,6 +189,7 @@
                    SUM(t1.valid_click_count) AS bclick
             FROM application.adq_advertiser_report_hourly t1
             WHERE t1.stat_date = #{startTime}
+              AND t1.project_id IS NOT NULL
             <if test='userIds!=null and userIds.size()>0'>
                 AND t1.user_id IN
                 <foreach collection="userIds" item="item" separator="," open="(" close=")">
@@ -283,6 +284,7 @@
             FROM application.adq_advertiser_report_daily t1
             WHERE t1.stat_date >= #{startTime}
               AND t1.stat_date &lt;= #{endTime}
+              AND t1.project_id IS NOT NULL
             <if test='userIds!=null and userIds.size()>0'>
                 AND t1.user_id IN
                 <foreach collection="userIds" item="item" separator="," open="(" close=")">

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -2004,9 +2004,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
         if ("admin".equals(roleCode)) {
             return materialStareMapper.getCompanyAllUserId(null);
         }
-        result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
+        result =  materialStareMapper.getUsersByLeaderId(userId);
         if(Check.isNull(result)){
-            result =  materialStareMapper.getUsersByLeaderId(userId);
+            result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
         }
         result.add(userId);