From caefe9a9cc486247f831e46356b0b03ca450fdf9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 10:14:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 0373c10..c827325 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -115,7 +115,9 @@
comActActivityDO.setStatus(3);
}
}
-
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -136,7 +138,7 @@
ComActActivityCode comActActivityCode = new ComActActivityCode();
comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
comActActivityCode.setCreateTime(new Date());
- comActActivityCode.setType(1);
+ comActActivityCode.setType(comActActivityVO.getType());
comActActivityCode.setStatus(1);
comActActivityCodeService.save(comActActivityCode);
return R.ok(activityId);
--
Gitblit v1.7.1