合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -152,6 +152,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
     public ResponseBean updateAnnouncement(String paramets,Integer communityId,Integer userId) {
                   ResponseBean response= new ResponseBean();
          TpAnnouncement tpAnnouncement = JSONObject.parseObject(paramets, TpAnnouncement.class);
+         int Status= Integer.parseInt(tpAnnouncement.getStatus());
+         if (0!=Status){
 //                        String announcementimg=tpAnnouncement.getAnnouncementCarouselImg();
 //                        tpAnnouncement.setAnnouncementCarouselImg( "".equals(announcementimg)?null:announcementimg);
                         tpAnnouncement.setCommunityId(communityId);
@@ -166,22 +168,23 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         Integer tdImagesUuid = parseObject.getInteger("id");
         String[] contentImgArray = contentImg.toArray(new String[]{});
         //修改图片时删除原来图片
-        if (contentImg.size()!=0){
-        QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TdImages::getUuid,tdImagesUuid);
-        queryWrapper.lambda().eq(TdImages::getType,"announcement");
-        imagesMapper.delete(queryWrapper);
-
-        for (String img:contentImgArray){
-            TdImages tdImages = new TdImages();
-            tdImages.setImageUrl(img);
-            tdImages.setType("announcement");
-            tdImages.setUuid(tpAnnouncement.getId());
-            tdImages.setCreateTime(LocalDateTime.now());
-            tdImages.setCreateUser(userId);
-            imagesMapper.insert(tdImages);
+        if (contentImg.size()!=0) {
+            QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(TdImages::getUuid, tdImagesUuid);
+            queryWrapper.lambda().eq(TdImages::getType, "announcement");
+            imagesMapper.delete(queryWrapper);
+
+            for (String img : contentImgArray) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                tdImages.setType("announcement");
+                tdImages.setUuid(tpAnnouncement.getId());
+                tdImages.setCreateTime(LocalDateTime.now());
+                tdImages.setCreateUser(userId);
+                imagesMapper.insert(tdImages);
             }
         }
+        }
         return response;
     }