Browse Source

代码合并

syh 4 years ago
parent
commit
1b21f36199

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCreativeController.java

@@ -58,7 +58,7 @@ public class ByteDanceCreativeController {
         Result<IPage<ByteDanceCreative>> result = new Result<>();
         QueryWrapper<ByteDanceCreative> queryWrapper = new QueryWrapper<>();
         if(null!=startDate&&!startDate.trim().equals("")){
-            queryWrapper.ge("",startDate+" 00:00:00");
+            queryWrapper.ge("creative_create_time",startDate+" 00:00:00");
         }
         if(null!=accountId){
             queryWrapper.eq("account_id",accountId);
@@ -67,7 +67,7 @@ public class ByteDanceCreativeController {
             queryWrapper.eq("plan_id",planId);
         }
         if(null!=endDate&&!endDate.trim().equals("")){
-            queryWrapper.le("",startDate+" 23:59:59");
+            queryWrapper.le("creative_create_time",endDate+" 23:59:59");
         }
         if(null!=name&&!"".equals(name.trim())){
             queryWrapper.like("title",name);