|
|
@@ -137,7 +137,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
ProductInfo productInfo = productInfo(productReviewReq.getSku());
|
|
|
Assert.notNull(productInfo, I18nUtil.getMessage("the_product_does_not_exist"));
|
|
|
validateReviewStatus(productInfo, productReviewReq.getStatus());
|
|
|
- sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_STATUS, StrUtil.toString(productReviewReq.getStatus()));
|
|
|
+ sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_STATUS, Objects.nonNull(productReviewReq.getStatus()) ? StrUtil.toString(productReviewReq.getStatus()) : null);
|
|
|
productInfo.setStatus(productReviewReq.getStatus());
|
|
|
productInfo.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString(ProductConstant.SUB) : null);
|
|
|
productInfo.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
|
|
|
@@ -158,7 +158,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
ProductInfo productInfo = productInfo(idleAttributeReq.getSku());
|
|
|
|
|
|
sysDictDataService.validateOptions(ProductConstant.DICT_KEY_WHETHER, idleAttributeReq.getIdleFlag() ? StrUtil.toString(WhetherEnum.YES.getCode()) : StrUtil.toString(WhetherEnum.NO.getCode()));
|
|
|
- sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PERMISSION, StrUtil.toString(idleAttributeReq.getPermission()));
|
|
|
+ sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PERMISSION, Objects.nonNull(idleAttributeReq.getPermission()) ? StrUtil.toString(idleAttributeReq.getPermission()) : null);
|
|
|
|
|
|
productInfo.setIdleFlag(BooleanUtil.isTrue(idleAttributeReq.getIdleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
|
|
|
ProductPermission productPermission = productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, productInfo.getSku()).one();
|
|
|
@@ -296,7 +296,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
@Override
|
|
|
public Boolean edit(ProductInfoEditReq productInfoEditReq) {
|
|
|
ProductInfo productInfo = productInfo(productInfoEditReq.getSku());
|
|
|
- sysDictDataService.validateOptions(ProductConstant.DICT_KEY_LABEL, StrUtil.toString(productInfoEditReq.getLabelKey()));
|
|
|
+ sysDictDataService.validateOptions(ProductConstant.DICT_KEY_LABEL, StrUtil.isBlank(productInfoEditReq.getLabelKey()) ? StrUtil.EMPTY : productInfoEditReq.getLabelKey());
|
|
|
if (StrUtil.isNotBlank(productInfoEditReq.getProductName())) {
|
|
|
productInfo.setProductName(productInfoEditReq.getProductName());
|
|
|
}
|
