From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index a57dbcc..5a69cd1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -7,8 +7,6 @@
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
-import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
@@ -94,7 +92,8 @@
@Override
public R detailEasyPhoto(Long id, Long userId) {
ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
- if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null==comActEasyPhotoVO.getStatus()) {
+ Integer status = comActEasyPhotoVO.getStatus();
+ if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null== status) {
return R.fail("随手拍不存在");
}
ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
@@ -103,7 +102,12 @@
} else {
comActEasyPhotoVO.setHaveGiveThumbsUp(1);
}
- List<ComActEasyPhotoCommentVO> comActEasyPhotoCommentVOList=new ArrayList<>();
+ if (status.intValue()==4) {
+ Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
+ if (null==feedbackAt) {
+ comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
+ }
+ }
return R.ok(comActEasyPhotoVO);
}
@@ -243,12 +247,17 @@
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActEasyPhotoVO1 -> {
Long id = comActEasyPhotoVO1.getId();
+ Integer status = comActEasyPhotoVO1.getStatus();
+ Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
}else {
comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
}
+ if(status.intValue()==4&&null==feedbackAt){
+ comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
+ }
});
iPage.setRecords(records);
}
--
Gitblit v1.7.1