Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -326,13 +326,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     iterator.remove();
                 }
             }
-            if (CollectionUtils.isEmpty(result)) {
-            /*Collections.sort(numList);
+            /*if (CollectionUtils.isEmpty(result)) {
+                Collections.sort(numList);
                 String subList = numList.stream().map(String::valueOf).collect(Collectors.joining("、"));
-            return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "第" + subList + "行未成功！");*/
-                erroeImport(fileList);
-                return;
-            }
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "第" + subList + "行未成功！");
+            }*/
+            if (!CollectionUtils.isEmpty(result)) {
                 List<IcPartymemberStyleImageEntity> imageList = new ArrayList<>();
                 List<IcPartymemberStyleEntity> list = result.stream().map(item -> {
                     IcPartymemberStyleEntity entity = new IcPartymemberStyleEntity();
@@ -364,6 +363,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str + "第" + subList + "行未成功！");
                 }
                 return new Result().ok(str);*/
+            }
+            //生成导入失败数据对应的文件，修改任务状态
             String url = erroeImport(fileList);
             upImportTask(url, taskId, tokenDto.getUserId(), true);
         } catch (Exception e) {