From 133bbaabbf17f5a0a478549a50f7fb89b883fef9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 16:06:46 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index c4401cb..38c60ce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -120,6 +120,25 @@
 				throw new SpecialException(1, "淇敼鍐呭宸蹭笉瀛樺湪");
 			}
 			
+			// 鍒犻櫎鍥剧墖
+			Boolean delIcon = record.getDelIcon();
+			if (delIcon != null && delIcon) {
+				removePicture(resultObj.getIcon());
+				resultObj.setIcon(null);
+			}
+			Boolean delPicture = record.getDelPicture();
+			if (delPicture != null && delPicture) {
+				removePicture(resultObj.getPicture());
+				resultObj.setPicture(null);
+			}
+			Boolean delSubPicture = record.getDelSubPicture();
+			if (delSubPicture != null && delSubPicture) {
+				removePicture(resultObj.getSubPicture());
+				resultObj.setSubPicture(null);
+			}
+			
+			
+			
 			if (picture != null && picture.trim().length() > 0) {
 				// 鍒犻櫎鑰佸浘
 				removePicture(resultObj.getPicture());

--
Gitblit v1.8.0