From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index a6f9814..97e0f46 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -101,10 +101,15 @@
ExceptionCast.cast(DocumentCode.DOC_CLASS_ERROR);
String fileName = FileUtilS.getFilenameNonSuffix(file.getOriginalFilename());
String fileNameAll = file.getOriginalFilename();
- DocInfo en = findByAttrAndDocName(fileName, uploadRequest.getAttributionType(), uploadRequest.getAttributionId());
+ List<DocInfo> docInfoList = super.getBaseMapper().findByAttrAndDocName(fileName, uploadRequest.getAttributionType(), uploadRequest.getAttributionId());
//閽堝瀛樺湪鐨勫鐞�
- if(en != null)
- ExceptionCast.cast(DocumentCode.DOC_IS_EXIST);
+ if(docInfoList != null){
+ docInfoList.forEach(item->{
+ if (item.getClassificationId().equals(docClass.getClassificationId())) {
+ ExceptionCast.cast(DocumentCode.DOC_IS_EXIST);
+ }
+ });
+ }
FileUploadResult fileUploadResult = FileUtilS.uploadFile(file);
if(fileUploadResult == null)
ExceptionCast.cast(DocumentCode.DOC_UPLOAD_ERROR);
--
Gitblit v1.9.3