From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 12 ++++++++++++
1 files changed, 12 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 1de6b47..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());
@@ -304,6 +307,15 @@
*/
@Override
public R easyPublicityByAdmin(ComActEasyPhotoEditAdminDTO photoEditDTO){
+
+ if(photoEditDTO.getType().equals(1)){
+ Integer count = this.baseMapper.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
+ .eq(ComActEasyPhotoDO::getHandleStatus,ComActEasyPhotoDO.handleStatus.no).in(ComActEasyPhotoDO::getId,photoEditDTO.getIds()));
+ if(count > 0){
+ return R.fail("您选择的有未处理的随手拍，不可进行操作");
+ }
+ }
+
if(this.baseMapper.easyPublicityByAdmin(photoEditDTO) > 0){
return R.ok();
}else{
--
Gitblit v1.7.1