Merge branch 'wangdingyi' into 'dev'

编辑任务

See merge request !139

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -293,11 +293,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
             if (!Objects.equals(oldSample.getManufacturingEnterprise(), newSample.getManufacturingEnterprise())){
                 // 留档文件
                 List<ReviewEnterpriseArchive> reviewEnterpriseArchiveList = reviewEnterpriseArchiveMapper.findList(request.getId());
-                for (ReviewEnterpriseArchive reviewEnterpriseArchive : reviewEnterpriseArchiveList) {
-                    reviewEnterpriseArchive.setEnterpriseName(newSample.getManufacturingEnterprise());
-                }
 
-                reviewEnterpriseArchiveService.updateBatchById(reviewEnterpriseArchiveList);
+                if (reviewEnterpriseArchiveList.size() != 0 && reviewEnterpriseArchiveList != null) {
+                    for (ReviewEnterpriseArchive reviewEnterpriseArchive : reviewEnterpriseArchiveList) {
+                        reviewEnterpriseArchive.setEnterpriseName(newSample.getManufacturingEnterprise());
+                    }
+
+                    reviewEnterpriseArchiveService.updateBatchById(reviewEnterpriseArchiveList);
+                }
 
             }
         }