From 1eed180f9c2bf73130ddcab66d25e6a641660ff0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:13:33 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
index 13e2d78..1126a4c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
@@ -120,7 +120,7 @@
public String infoBenefitsVideos(Model model, @PathVariable("id") Integer id,@PathVariable("type") Integer type,@PathVariable("benefitsVideosId") Integer benefitsVideosId) {
TQueryBenefitsVideosVO tQueryBenefitsVideosVO = new TQueryBenefitsVideosVO();
BenefitsVideos benefitVideosById = benefitsVideoClient.getBenefitVideosById(benefitsVideosId);
- TCourse tCourse = courseClient.queryCourseById(id);
+ TCourse tCourse = courseClient.queryCourseById(benefitVideosById.getCourseId());
BeanUtils.copyProperties(tCourse,tQueryBenefitsVideosVO);
tQueryBenefitsVideosVO.setIntegral(benefitVideosById.getIntegral());
tQueryBenefitsVideosVO.setBenefitsVideosId(benefitVideosById.getId());
@@ -179,6 +179,7 @@
for (BenefitsVideos benefitsVideos : benefitVideoById) {
for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){
+ courseByCourseId.setId(benefitsVideos.getId());
courseByCourseId.setIntegral(benefitsVideos.getIntegral());
courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
courseByCourseId.setState(benefitsVideos.getState());
@@ -210,9 +211,9 @@
if (bvcf.getId()!=null){
return benefitsVideoClient.addBenefitsVideos(bvcf);
}else {
- bvcf.setState(1);
- bvcf.setInsertTime(new Date());
- return benefitsVideoClient.addBenefitsVideos(bvcf);
+ bvcf.setState(1);
+ bvcf.setInsertTime(new Date());
+ return benefitsVideoClient.addBenefitsVideos(bvcf);
}
}
--
Gitblit v1.7.1