|
|
@@ -36,6 +36,7 @@ import com.chelvc.framework.common.model.Pagination;
|
|
|
import com.chelvc.framework.common.model.Paging;
|
|
|
import com.chelvc.framework.common.util.AssertUtils;
|
|
|
import com.chelvc.framework.common.util.ObjectUtils;
|
|
|
+import com.chelvc.framework.common.util.StringUtils;
|
|
|
import com.chelvc.framework.database.context.DatabaseContextHolder;
|
|
|
import com.chelvc.framework.database.entity.ModifyEntity;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
@@ -341,8 +342,10 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
|
public List<GoodsAssessDto> merchantQuery(AssessQueryParam param) {
|
|
|
AssertUtils.nonnull(param.getMerchantId(), "query merchant assess merchantId must not be null");
|
|
|
List<GoodsAssess> list = this.lambdaQuery()
|
|
|
- .eq(GoodsAssess::getGoodsId,param.getGoodsId())
|
|
|
+ .eq(StringUtils.notEmpty(param.getGoodsId()),GoodsAssess::getGoodsId,param.getGoodsId())
|
|
|
.eq(GoodsAssess::getMerchantId,param.getMerchantId())
|
|
|
+ .eq(StringUtils.notEmpty(param.getScore()),GoodsAssess::getScore,param.getScore())
|
|
|
+ .eq(StringUtils.notEmpty(param.getIsRecover()),GoodsAssess::getIsRecover,param.getIsRecover())
|
|
|
.orderByDesc(ModifyEntity::getCreateTime).list();
|
|
|
List<GoodsAssessDto> goodsAssessDtoList = GoodsAssessCopier.INSTANCE.copying(list);
|
|
|
if (CollectionUtils.isEmpty(goodsAssessDtoList)){
|
