Prechádzať zdrojové kódy

Merge branch 'V2.0.1' into test

zhaoxian 3 rokov pred
rodič
commit
3925598278

+ 3 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouAccountAutoDoServiceImpl.java

@@ -1693,7 +1693,7 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
             }
         } else {
             String materialKeyword = strategy.getMaterialKeyword();
-            if(materialKeyword!=null&& materialKeyword.contains("-")){
+            if (materialKeyword != null && materialKeyword.contains("-")) {
                 keyword = Arrays.asList(materialKeyword.split("-"));
             }
         }
@@ -1870,7 +1870,8 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
             }
             //深度转化目标出价
             if (!Check.isNull(strategy.getDeepConversionBid())) {
-                unitParams.put("deep_conversion_bid", strategy.getDeepConversionBid());
+                Long cpdBid = getBidByString(strategy.getDeepConversionBid());
+                unitParams.put("deep_conversion_bid", cpdBid);
             }
             Integer sceneId = null;
             String scenceIdString = strategy.getSceneId();

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/service/impl/DocumentLibraryServiceImpl.java

@@ -238,7 +238,7 @@ public class DocumentLibraryServiceImpl implements DocumentLibraryService {
         }
         ExportExcelUtils eeu = new ExportExcelUtils();
         JSONArray array = new JSONArray();
-        for (int i = 1; i <= rows + 1; i++) {
+        for (int i = 0; i <= rows + 1; i++) {
             Row row = sheet.getRow(i);
             if (row != null) {
                 String value = eeu.getCellValue(row.getCell(0));