From accc335d5753b25e75789ce5374896fd40387434 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 13:45:13 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
index b396826..3d38f3a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -153,6 +153,9 @@
         if(easyPhotoDO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){
             return R.fail("该随手拍已处理");
         }
+        if(easyPhotoDO.getIsReport().equals(ComActEasyPhotoDO.isReport.no)){
+            return R.fail("该随手拍未上报社区");
+        }
         BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
         easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
         easyPhotoDO.setFeedbackAt(new Date());

--
Gitblit v1.7.1