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

BUGFIX:aida;

Browse Source
This commit is contained in:
shahaibo
2024-07-04 13:02:47 +08:00
parent 4a533b3cf0
commit 5fa7e36dc2
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
portfolio.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId()); portfolio.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
}else { }else {
portfolio.setOriginal(1); portfolio.setOriginal(1);
portfolio.setOriginalAccountId(authPrincipalVo.getId()); // portfolio.setOriginalAccountId(authPrincipalVo.getId());
} }
portfolio.setPortfolioName(portfolioDTO.getPortfolioName()); portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
portfolio.setPortfolioType("History"); portfolio.setPortfolioType("History");
@@ -259,6 +259,15 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
if (!CollectionUtils.isEmpty(portfolios)) { if (!CollectionUtils.isEmpty(portfolios)) {
portfolio = portfolios.get(0); portfolio = portfolios.get(0);
} }
UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
if (userLikeGroup.getOriginal() == 0) {
portfolio.setOriginal(0);
portfolio.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
portfolio.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
}else {
portfolio.setOriginal(1);
// portfolio.setOriginalAccountId(authPrincipalVo.getId());
}
portfolio.setPortfolioName(portfolioDTO.getPortfolioName()); portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
portfolio.setPortfolioType("Canvas"); portfolio.setPortfolioType("Canvas");
portfolio.setAccountId(authPrincipalVo.getId()); portfolio.setAccountId(authPrincipalVo.getId());
@@ -507,11 +516,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
userLikeGroupNew.setCreateDate(new Date()); userLikeGroupNew.setCreateDate(new Date());
if (portfolio.getOriginal() == 1) { if (portfolio.getOriginal() == 1) {
if (Objects.equals(portfolio.getAccountId(), authPrincipalVo.getId())) { if (Objects.equals(portfolio.getAccountId(), authPrincipalVo.getId())) {
userLikeGroupNew.setOriginal(1);
}else {
userLikeGroupNew.setOriginal(0); userLikeGroupNew.setOriginal(0);
userLikeGroupNew.setOriginalAccountId(portfolio.getAccountId()); userLikeGroupNew.setOriginalAccountId(portfolio.getAccountId());
userLikeGroupNew.setOriginalPortfolioId(portfolio.getId()); userLikeGroupNew.setOriginalPortfolioId(portfolio.getId());
}else {
userLikeGroupNew.setOriginal(1);
} }
}else { }else {
userLikeGroupNew.setOriginal(0); userLikeGroupNew.setOriginal(0);