From 2406574c36a8c4e8e8ffe7c56a34e25dde107a84 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 17:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index b3437e9..9725340 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -16,7 +16,6 @@
import com.yeshi.fanli.dao.mybatis.homemodule.SpecialCardMapper;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;
-import com.yeshi.fanli.exception.FloatADException;
import com.yeshi.fanli.exception.homemodule.SpecialCardException;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
@@ -79,7 +78,14 @@
// 淇敼
SpecialCard resultObj = specialCardMapper.selectByPrimaryKey(id);
if (resultObj == null) {
- throw new FloatADException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
+ throw new SpecialCardException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
+ }
+
+ // 鍒犻櫎鍥剧墖
+ Boolean delPicture = record.getDelPicture();
+ if (delPicture != null && delPicture) {
+ removePicture(resultObj.getBottomPicture());
+ resultObj.setBottomPicture(null);
}
if (picture != null && picture.trim().length() > 0) {
--
Gitblit v1.8.0