From b9ee8fe325fa9746b284d3487df96d93d84d6473 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 18:05:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index 80cd0a2..936256b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -182,8 +182,11 @@
         comPbActivityDO.setEnrollTimeBegin(now);
         comPbActivityDO.setCreateAt(now);
 
-        //默认设置为“进行中”
-        comPbActivityDO.setStatus(4);
+        Integer status = partyBuildingActivityVO.getStatus();
+        if(status!=null && status.intValue()==2) {//点击'保存并发布' 按钮
+            //默认设置为“进行中”
+            comPbActivityDO.setStatus(4);
+        }
 
         int insert = comBpActivityDAO.insert(comPbActivityDO);
         if (insert > 0) {

--
Gitblit v1.7.1