From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
index 7f6210e..9a51701 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
@@ -31,39 +31,40 @@
      */
     @Java110Transactional
     public ResponseEntity<String> update(ApplyRoomDiscountPo applyRoomDiscountPo) {
-
+        List<String> photos = applyRoomDiscountPo.getPhotos();
+        applyRoomDiscountPo.setPhotos(null);
         int flag = applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
 
-        if (flag > 0) {
-            //鑾峰彇鍥剧墖闆嗗悎
-            List<String> photos = applyRoomDiscountPo.getPhotos();
-            if (photos != null && photos.size() > 0) {
-                FileRelDto fileRelDto = new FileRelDto();
-                fileRelDto.setObjId(applyRoomDiscountPo.getArdId());
-                List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-                if (fileRelDtos != null && fileRelDtos.size() > 0) {
-                    FileRelPo fileRelPo = new FileRelPo();
-                    fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
-                    fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
-                }
-                FileRelPo fileRel = new FileRelPo();
-                fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
-                fileRel.setObjId(applyRoomDiscountPo.getArdId());
-                //table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
-                fileRel.setSaveWay("ftp");
-                fileRel.setCreateTime(new Date());
-                //19000琛ㄧず瑁呬慨鍥剧墖
-                fileRel.setRelTypeCd("19000");
-                for (String photo : photos) {
-                    fileRel.setFileRealName(photo);
-                    fileRel.setFileSaveName(photo);
-                    fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
-                }
-            }
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+        if (flag < 1) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
         }
+        //鑾峰彇鍥剧墖闆嗗悎
+        if (photos != null && photos.size() > 0) {
+            FileRelDto fileRelDto = new FileRelDto();
+            fileRelDto.setObjId(applyRoomDiscountPo.getArdId());
+            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+            if (fileRelDtos != null && fileRelDtos.size() > 0) {
+                FileRelPo fileRelPo = new FileRelPo();
+                fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
+                fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
+            }
+            FileRelPo fileRel = new FileRelPo();
+            fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+            fileRel.setObjId(applyRoomDiscountPo.getArdId());
+            //table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
+            fileRel.setSaveWay("ftp");
+            fileRel.setCreateTime(new Date());
+            //19000琛ㄧず瑁呬慨鍥剧墖
+            fileRel.setRelTypeCd("19000");
+            for (String photo : photos) {
+                fileRel.setFileRealName(photo);
+                fileRel.setFileSaveName(photo);
+                fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
+            }
+        }
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
 
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+
     }
 
 }

--
Gitblit v1.8.0