Merge branch 'dev/dev' into dev/dev_xp
This commit is contained in:
@@ -12,7 +12,7 @@ import java.util.List;
|
|||||||
@ApiModel("design like-响应")
|
@ApiModel("design like-响应")
|
||||||
public class DesignLikeVO {
|
public class DesignLikeVO {
|
||||||
|
|
||||||
private Long id;
|
private Long userLikeSortId;
|
||||||
|
|
||||||
@ApiModelProperty("分组id")
|
@ApiModelProperty("分组id")
|
||||||
private Long userGroupId;
|
private Long userGroupId;
|
||||||
|
|||||||
@@ -1175,11 +1175,17 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
qw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId);
|
qw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId);
|
||||||
qw.lambda().orderByDesc(UserLikeSort::getSort);
|
qw.lambda().orderByDesc(UserLikeSort::getSort);
|
||||||
List<UserLikeSort> userLikeSorts = userLikeSortMapper.selectList(qw);
|
List<UserLikeSort> userLikeSorts = userLikeSortMapper.selectList(qw);
|
||||||
Integer sort = userLikeSorts.get(0).getSort();
|
|
||||||
UserLikeSort userLikeSort = new UserLikeSort();
|
UserLikeSort userLikeSort = new UserLikeSort();
|
||||||
userLikeSort.setUserLikeGroupId(userGroupId);
|
if (CollectionUtils.isEmpty(userLikeSorts)) {
|
||||||
userLikeSort.setUserLikeId(userLike.getId());
|
userLikeSort.setUserLikeGroupId(userGroupId);
|
||||||
userLikeSort.setSort(sort + 1);
|
userLikeSort.setUserLikeId(userLike.getId());
|
||||||
|
userLikeSort.setSort(1);
|
||||||
|
}else {
|
||||||
|
Integer sort = userLikeSorts.get(0).getSort();
|
||||||
|
userLikeSort.setUserLikeGroupId(userGroupId);
|
||||||
|
userLikeSort.setUserLikeId(userLike.getId());
|
||||||
|
userLikeSort.setSort(sort + 1);
|
||||||
|
}
|
||||||
userLikeSortMapper.insert(userLikeSort);
|
userLikeSortMapper.insert(userLikeSort);
|
||||||
sortParam = userLikeSort.getSort();
|
sortParam = userLikeSort.getSort();
|
||||||
userLikeSortId = userLikeSort.getId();
|
userLikeSortId = userLikeSort.getId();
|
||||||
|
|||||||
Reference in New Issue
Block a user