From c9164d85321d3e1da379dd34080974a9527c49ea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 九月 2023 17:09:45 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 7 +++++--
server/zhubo/pom.xml | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index adf97ea..23499bd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -1093,7 +1093,9 @@
.apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getEPrice()), " t.PRICE <= "+pageWrap.getModel().getEPrice()+" ");
queryWrapper.orderByDesc(Goods::getId);
IPage<Goods> goodsIPage = goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
- this.dealGoodsMsg(goodsIPage.getRecords());
+ if(!Objects.isNull(goodsIPage.getRecords())&&goodsIPage.getRecords().size()>Constants.ZERO){
+ this.dealGoodsMsg(goodsIPage.getRecords());
+ }
return PageData.from(goodsIPage);
}
@@ -1103,8 +1105,9 @@
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
String prefixUrlCategory = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
+
List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
.in("OBJ_ID",integerList).eq("TYPE",Constants.ZERO));
List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
diff --git a/server/zhubo/pom.xml b/server/zhubo/pom.xml
index 7645a85..2cfd25e 100644
--- a/server/zhubo/pom.xml
+++ b/server/zhubo/pom.xml
@@ -26,7 +26,7 @@
</dependencies>
<build>
- <finalName>company</finalName>
+ <finalName>zhubo</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
--
Gitblit v1.9.3