Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/test'

songyh 4 gadi atpakaļ
vecāks
revīzija
a4ea80c264

+ 3 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/ByteDanceGeneralCopywriterServiceImpl.java

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -39,7 +40,7 @@ public class ByteDanceGeneralCopywriterServiceImpl extends ServiceImpl<ByteDance
 
     @Override
     public Result getGeneralCopywriterReport(String userId, String accountId, String keyWord, String startTime, String endTime, Integer pageNum, Integer pageSize){
-        PageHelper.startPage(pageNum,pageSize);
+
 
         List<String> accountIds = new ArrayList<>();
         //查询普通用户的全量查询,当前用户所有项目
@@ -60,6 +61,7 @@ public class ByteDanceGeneralCopywriterServiceImpl extends ServiceImpl<ByteDance
         }
 
 
+        PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> generalCopywriteReportList = byteDanceGeneralCopywriterMapper.selectGeneralCopywriterReport(accountIds,keyWord, startTime, endTime);
         if(Check.isNull(generalCopywriteReportList)){
             return Result.successMsg("还没有此文案报表数据,请将此文案投放跑量!",generalCopywriteReportList);

+ 2 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/BytedanceVideoSlogenInfoServiceImpl.java

@@ -63,7 +63,7 @@ public class BytedanceVideoSlogenInfoServiceImpl extends ServiceImpl<BytedanceVi
     }
     @Override
     public Result getVideoSlogenReport(String userId, String projectId,String keyWord, String startTime, String endTime, Integer pageNum, Integer pageSize){
-        PageHelper.startPage(pageNum,pageSize);
+
         List<String> projectIdList = new ArrayList<>();
         //查询普通用户的全量查询,当前用户所有项目
         if(Check.isNull(projectId)){
@@ -74,6 +74,7 @@ public class BytedanceVideoSlogenInfoServiceImpl extends ServiceImpl<BytedanceVi
             projectIdList.add(projectId);
         }
 
+        PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> videoSlogenReportList = bytedanceVideoSlogenInfoMapper.selectVideoSlogenReportByAccountIdAndTitle(projectIdList, keyWord, startTime, endTime);
 
         if(Check.isNull(videoSlogenReportList)){