From d3017259af8b19968547ecb2207b91407e8fec02 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 15:05:48 +0800
Subject: [PATCH] 微心愿接口问题调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
index 493fd17..7eda198 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -121,16 +121,14 @@
}
}
//查询反馈列表
- if(comActMicroWishVO.getStatus()==5||comActMicroWishVO.getStatus()==6){
- List<ComActMicroWishFeedbackVO> list=comActMicroWishFeedbackMapper.selectByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setFeedbackVOList(list);
- }
+ List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
+ if(!feedList.isEmpty()){
+ comActMicroWishVO.setFeedbackVOList(feedList);
}
//查询操作记录
- List<ComActMicroWishOperationRecordVO> list=comActMicroWishOperationRecordMapper.getByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setOperationRecordVOList(list);
+ List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
+ if(!operationList.isEmpty()){
+ comActMicroWishVO.setOperationRecordVOList(operationList);
}
comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
//查询同类型id数组
@@ -204,7 +202,7 @@
comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList);
comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId());
comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId());
- if(comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
+ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
}
else {
--
Gitblit v1.7.1