FengChaoYu 6 månader sedan
förälder
incheckning
e5581d341b

+ 3 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -700,8 +700,9 @@ public class AdminWebsitLogic {
         List<AdminWebsitPayConfig> allPayConfigList = new ArrayList<>();
         for (int i = 0; i < objects.size(); i++) {
             int rowIndex = i + 2;
-            CommonUtils.initList2(objects, 40);
             List<Object> row = (List<Object>) objects.get(i);
+            CommonUtils.initList2(row, 42);
+
             if (Objects.isNull(row.get(0)) || org.apache.commons.lang3.StringUtils.isBlank(row.get(0).toString())) {
                 throw new RemoteServiceException("第" + rowIndex + "行, 所属公司不能为空");
             }
@@ -888,6 +889,7 @@ public class AdminWebsitLogic {
                         if (Objects.isNull(row.get(detailStartIndex + 1)) || org.apache.commons.lang3.StringUtils.isBlank(row.get(detailStartIndex + 1).toString())) {
 //                            throw new RemoteServiceException("第" + rowIndex + "行, 通联商户名称" + detailIndex + "不能为空");
                             isOn = false;
+                            continue;
                         }
 
 //                      if (Objects.isNull(row.get(detailStartIndex + 2)) || org.apache.commons.lang3.StringUtils.isBlank(row.get(detailStartIndex + 2).toString())) {