diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java index ddd08b60e..590a42f2d 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java @@ -150,7 +150,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService checkPmsProjectById(pmsDocument.getPmsProjectId()); checkAuthAndReturnAdminStatus(pmsDocument.getPmsEnterpriseId()); String currentUserName = SecurityUtils.getUsername(); - checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId()); + checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId(), pmsDocument.getPmsEnterpriseId()); pmsDocument.setCreateTime(DateUtils.getNowDate()); pmsDocument.setCreateBy(currentUserName); return pmsDocumentMapper.insertPmsDocument(pmsDocument); @@ -311,7 +311,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService pmsDocument.setCreateTime(DateUtils.getNowDate()); pmsDocument.setUpdateTime(DateUtils.getNowDate()); pmsDocument.setCreateBy(currentUserName); - checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId()); + checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId(), pmsDocument.getPmsEnterpriseId()); pmsDocumentList.add(pmsDocument); } return pmsDocumentMapper.batchInsertPmsDocument(pmsDocumentList); @@ -324,7 +324,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService } } - private void checkForSameDocumentExistence(String name, Integer docType, Long parentId, Long pmsProjectId) { + private void checkForSameDocumentExistence(String name, Integer docType, Long parentId, Long pmsProjectId, Long pmsEnterpriseId) { if (pmsDocumentMapper.countDocumentByNameAndTypeAndParenId(name, docType, parentId, pmsProjectId) > 0) { throw new ServiceException("当前目录已存在同名文档:[%s]", name); }