From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 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 2ecd3e3..a98908f 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
@@ -122,11 +122,13 @@
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));
- if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
- comActEasyPhotoVO.setHaveGiveThumbsUp(0);
- } else {
- comActEasyPhotoVO.setHaveGiveThumbsUp(1);
+ if(!userId.equals(0L)){
+ ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
+ if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
+ comActEasyPhotoVO.setHaveGiveThumbsUp(0);
+ } else {
+ comActEasyPhotoVO.setHaveGiveThumbsUp(1);
+ }
}
if (status.intValue()==4) {
@@ -312,23 +314,25 @@
page.setCurrent(pageNum);
IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoApplets(page, comActEasyPhotoVO);
List<ComActEasyPhotoVO> records = iPage.getRecords();
- if (!ObjectUtils.isEmpty(records)) {
- records.forEach(comActEasyPhotoVO1 -> {
- Long id = comActEasyPhotoVO1.getId();
- Integer status = comActEasyPhotoVO1.getStatus();
- Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
- List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
- comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
- if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
- comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
- }else {
- comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
- }
- if(status.intValue()==4&&null==feedbackAt){
- comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
- }
- });
- iPage.setRecords(records);
+ if(userId != null){
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActEasyPhotoVO1 -> {
+ Long id = comActEasyPhotoVO1.getId();
+ Integer status = comActEasyPhotoVO1.getStatus();
+ Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
+ List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
+ comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
+ if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
+ comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
+ }else {
+ comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
+ }
+ if(status.intValue()==4&&null==feedbackAt){
+ comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
+ }
+ });
+ iPage.setRecords(records);
+ }
}
return R.ok(iPage);
}
--
Gitblit v1.7.1