Merge remote-tracking branch 'origin/master'

hx-file/src/main/java/com/fjhx/file/service/impl/FileInfoServiceImpl.java

@@ -164,13 +164,14 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     @Override
     public void editFile(List<ObsFile> obsFileList, Long businessId, Integer businessType) {
         if (obsFileList == null || obsFileList.size() == 0) {
-            this.remove(q -> q.eq(FileInfo::getBusinessId, businessId));
+            this.remove(q -> q.eq(FileInfo::getBusinessId, businessId).eq(FileInfo::getBusinessType, businessType));
             return;
         }
 
         // 删除不包含在此列表的业务id文件
         List<Long> obsFileId = obsFileList.stream().map(ObsFile::getId).collect(Collectors.toList());
-        this.remove(q -> q.notIn(ObjectUtil.isNotEmpty(obsFileId), BaseIdPo::getId, obsFileId).eq(FileInfo::getBusinessId, businessId));
+        this.remove(q -> q.notIn(ObjectUtil.isNotEmpty(obsFileId), BaseIdPo::getId, obsFileId)
+                .eq(FileInfo::getBusinessId, businessId).eq(FileInfo::getBusinessType, businessType));
 
         // 更新在此列表的文件
         saveFile(obsFileList, businessId, businessType);