From f0e17b0704b8f12948988b045e2b55ecfa7c4d5a Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 3 Jan 2025 17:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E7=A8=8B=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/serviceimpl/EdPrjServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index a7f83e5..3309781 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -73,6 +73,7 @@ public class EdPrjServiceImpl extends ServiceImpl try { // 保存信息到MySQL String maxPrjId = this.baseMapper.maxPrjId(); + int prjCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, PRJ_PARENT_ID)).intValue(); int id = Integer.parseInt(StrUtil.isEmpty(maxPrjId) ? "100000" : maxPrjId); Date now = new Date(); String currentUserId = UserThreadLocal.getUserId(); @@ -92,7 +93,7 @@ public class EdPrjServiceImpl extends ServiceImpl .setEffectFlag(EffectFlagEnum.EFFECT.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(newPrjId) - .setSort(1) + .setSort(++prjCount) .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setCreatedTime(now) .setUpdatedTime(now) @@ -401,7 +402,7 @@ public class EdPrjServiceImpl extends ServiceImpl try { String parentId = this.baseMapper.selectById(id).getParentId(); // 首先检查同层是否有同名目录 - Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName)); + Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName), "子集名已经存在"); String currentUserId = UserThreadLocal.getUserId(); Date now = new Date(); EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)