From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index d001cab..ecda896 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -233,8 +233,10 @@
List<ImgInfo> imgList = goodsEvaluate.getImgList();
if (imgList != null && imgList.size() > 0) {
for (ImgInfo imgInfo: imgList) {
- if (imgInfo.getType() == ImgEnum.img && !StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
+ if (!StringUtil.isNullOrEmpty(imgInfo.getUrl()) && StringUtil.isNullOrEmpty(picUrl)
+ && (imgInfo.getType() == ImgEnum.img || imgInfo.getType() == ImgEnum.activity)) {
picUrl = imgInfo.getUrl();
+ break;
}
}
}
@@ -246,7 +248,7 @@
// 瀹氭椂鏃堕棿
- if (StringUtil.isNullOrEmpty(record.getControlTime_str())) {
+ if (!StringUtil.isNullOrEmpty(record.getControlTime_str())) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
record.setControlTime(format.parse(record.getControlTime_str().replaceAll("T", " ")));
}
--
Gitblit v1.8.0