aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge

Browse Source
This commit is contained in:
litianxiang
2025-10-15 16:03:56 +08:00
parent 4578cb5778 9959a03ccc
commit 59602540a3
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
View File

@@ -682,6 +682,9 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
element.setUpdateDate(null); element.setUpdateDate(null);
element.setAccountId(accountId); element.setAccountId(accountId);
element.setProjectId(projectIdNew); element.setProjectId(projectIdNew);
if (element.getLevel3Type() == null) {
element.setLevel3Type(workspaceOld.getSex());
}
collectionElementMapper.insert(element); collectionElementMapper.insert(element);
Long collectionElementNewID = element.getId(); Long collectionElementNewID = element.getId();
if (collectionElementRelModelCopy != null) { if (collectionElementRelModelCopy != null) {
@@ -690,6 +693,17 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
collectionElementRelModelMapper.insert(collectionElementRelModelCopy); collectionElementRelModelMapper.insert(collectionElementRelModelCopy);
} }
; ;
} else if (element.getLevel1Type().equals(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())) {
// element.setCollectionId(collectionIdNew);
if (element.getLevel3Type() == null) {
element.setLevel3Type(workspaceOld.getSex());
}
element.setId(null);
element.setCreateDate(new Date());
element.setUpdateDate(null);
element.setAccountId(accountId);
element.setProjectId(projectIdNew);
collectionElementMapper.insert(element);
} else { } else {
// element.setCollectionId(collectionIdNew); // element.setCollectionId(collectionIdNew);
element.setId(null); element.setId(null);