From ec8d6cd39a6fd612c98636c9e4ff262263de424a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 09:54:17 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index c7b961e..a940986 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1049,7 +1049,7 @@
public R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
ComActNeighborCircleDO comActNeighborCircleDO=new ComActNeighborCircleDO();
BeanUtils.copyProperties(editNeighborCircleAdminVO,comActNeighborCircleDO);
- if(comActNeighborCircleDO.getSolveStatus()!=null){
+ if(comActNeighborCircleDO.getSolveStatus()!=null && comActNeighborCircleDO.getSolveStatus() == 3){
comActNeighborCircleDO.setSolveTime(new Date());
}
if(comActNeighborCircleDO.getOrderStatus()!=null){
--
Gitblit v1.7.1