|
@@ -9,6 +9,7 @@ import cn.hobbystocks.auc.common.utils.DateUtils;
|
|
|
import cn.hobbystocks.auc.domain.Auction;
|
|
import cn.hobbystocks.auc.domain.Auction;
|
|
|
import cn.hobbystocks.auc.dto.AuctionDTO;
|
|
import cn.hobbystocks.auc.dto.AuctionDTO;
|
|
|
import cn.hobbystocks.auc.vo.AuctionVO;
|
|
import cn.hobbystocks.auc.vo.AuctionVO;
|
|
|
|
|
+import cn.hutool.core.util.BooleanUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -89,7 +90,7 @@ public class AuctionController extends AdminBaseController {
|
|
|
Auction dbAuc = auctionService.selectAuctionById(auction.getId());
|
|
Auction dbAuc = auctionService.selectAuctionById(auction.getId());
|
|
|
if (Objects.isNull(dbAuc))
|
|
if (Objects.isNull(dbAuc))
|
|
|
return AjaxResult.error("没有找到拍卖会");
|
|
return AjaxResult.error("没有找到拍卖会");
|
|
|
- if (Objects.equals(Constants.PUB_STATUS_PUBLISHED, dbAuc.getPubStatus())) {
|
|
|
|
|
|
|
+ if ((BooleanUtil.isFalse(auction.getEditSortFlag())||Objects.isNull(auction.getEditSortFlag())) &&Objects.equals(Constants.PUB_STATUS_PUBLISHED, dbAuc.getPubStatus())) {
|
|
|
return AjaxResult.error("拍卖会已发布不能修改");
|
|
return AjaxResult.error("拍卖会已发布不能修改");
|
|
|
}
|
|
}
|
|
|
auction.setUpdateBy(getUsername());
|
|
auction.setUpdateBy(getUsername());
|