Jelajahi Sumber

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-cloud

yumeng 3 tahun lalu
induk
melakukan
2e89d54061

+ 1 - 1
jeecg-boot-report/src/main/java/cn/com/ctop/common/mapper/xml/UserAllocationMapper.xml

@@ -19,7 +19,7 @@
             #{item}
         </foreach>
         <if test="designUserId!=null">
-            abd t1.user_id = #{designUserId}
+            and t1.user_id = #{designUserId}
         </if>
         order by t1.create_time desc
     </select>

+ 1 - 1
jeecg-boot-report/src/main/java/cn/com/ctop/report/mapper/xml/KuaishouAccountReportHourlyDwMapper.xml

@@ -8,7 +8,7 @@
         account_name as authName,
         ${filedAll}
         FROM ctop_kuaishou_report_hourly_account t1
-        WHERE t1.stat_date = #{statDate}
+        WHERE t1.stat_date = #{startDate}
         and t1.`hour` &lt;= #{hour}
         AND t1.account_id in
         <foreach item="item" index="index" collection="accountIds"