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/SpecialServiceImpl.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 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..733b511 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()); @@ -374,6 +393,11 @@ return root; } + @Override + public List<Special> listByPlaceKey(String placeKey) { + return specialMapper.listByPlaceKey(placeKey); + } + /** * 澶勭悊 鏁版嵁 -- Gitblit v1.8.0