BUGFIX:aida;
This commit is contained in:
@@ -47,6 +47,10 @@ public class Portfolio implements Serializable {
|
|||||||
@ApiModelProperty(value = "是否允许二次创作1允许0不允许")
|
@ApiModelProperty(value = "是否允许二次创作1允许0不允许")
|
||||||
private Integer openSource;
|
private Integer openSource;
|
||||||
|
|
||||||
|
private Integer original;
|
||||||
|
|
||||||
|
private Long originalAccountId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "作品集作者ID")
|
@ApiModelProperty(value = "作品集作者ID")
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
|
|
||||||
|
|||||||
@@ -43,6 +43,10 @@ public class UserLikeGroup implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
private Integer original;
|
||||||
|
|
||||||
|
private Long originalAccountId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -110,7 +110,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
|
|
||||||
if (portfolioDTO.getOpenSource() == 1) {
|
if (portfolioDTO.getOpenSource() == 1) {
|
||||||
UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
|
UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
|
||||||
UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
|
UserLikeGroup userLikeGroupNew = CopyUtil.copyObject(userLikeGroup, UserLikeGroup.class);
|
||||||
|
userLikeGroupNew.setId(null);
|
||||||
userLikeGroupNew.setAccountId(-1L);
|
userLikeGroupNew.setAccountId(-1L);
|
||||||
Long collectionIdOld = userLikeGroup.getCollectionId();
|
Long collectionIdOld = userLikeGroup.getCollectionId();
|
||||||
Collection collectionOld = collectionMapper.selectById(collectionIdOld);
|
Collection collectionOld = collectionMapper.selectById(collectionIdOld);
|
||||||
@@ -137,6 +138,13 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
if (!CollectionUtils.isEmpty(portfolios)) {
|
if (!CollectionUtils.isEmpty(portfolios)) {
|
||||||
portfolio = portfolios.get(0);
|
portfolio = portfolios.get(0);
|
||||||
}
|
}
|
||||||
|
if (userLikeGroup.getOriginal() == 0) {
|
||||||
|
portfolio.setOriginal(0);
|
||||||
|
portfolio.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
|
||||||
|
}else {
|
||||||
|
portfolio.setOriginal(0);
|
||||||
|
portfolio.setOriginalAccountId(authPrincipalVo.getId());
|
||||||
|
}
|
||||||
portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
|
portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
|
||||||
portfolio.setPortfolioType("History");
|
portfolio.setPortfolioType("History");
|
||||||
portfolio.setCollectionId(collectionIdNew);
|
portfolio.setCollectionId(collectionIdNew);
|
||||||
@@ -463,6 +471,12 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
}
|
}
|
||||||
// UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById();
|
// UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById();
|
||||||
UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
|
UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
|
||||||
|
userLikeGroupNew.setOriginal(0);
|
||||||
|
if (portfolio.getOriginal() == 1) {
|
||||||
|
userLikeGroupNew.setOriginalAccountId(portfolio.getAccountId());
|
||||||
|
}else {
|
||||||
|
userLikeGroupNew.setOriginalAccountId(portfolio.getOriginalAccountId());
|
||||||
|
}
|
||||||
userLikeGroupNew.setAccountId(authPrincipalVo.getId());
|
userLikeGroupNew.setAccountId(authPrincipalVo.getId());
|
||||||
Long collectionIdOld = userLikeGroup.getCollectionId();
|
Long collectionIdOld = userLikeGroup.getCollectionId();
|
||||||
Collection collectionOld = collectionMapper.selectById(collectionIdOld);
|
Collection collectionOld = collectionMapper.selectById(collectionIdOld);
|
||||||
|
|||||||
Reference in New Issue
Block a user