From 4957b28d9b87a3345c71f8348e7f08de0d1346de Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:59:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
index 42fe91e..bde8b41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -83,12 +83,12 @@
if (workGuideMaterialDO1 != null) {//2、如果db有,执行编辑
workGuideMaterialDO1.setMaterialName(materialsVO.getMaterialName());
workGuideMaterialDAO.updateById(workGuideMaterialDO1);
- } else {//3、如果db没有，执行新增
- ComActWorkGuideMaterialDO newWorkGuideMaterialDO = new ComActWorkGuideMaterialDO();
- newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
- newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
- workGuideMaterialDAO.insert(newWorkGuideMaterialDO);
}
+ } else {//3、如果db没有，执行新增
+ ComActWorkGuideMaterialDO newWorkGuideMaterialDO = new ComActWorkGuideMaterialDO();
+ newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
+ newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
+ workGuideMaterialDAO.insert(newWorkGuideMaterialDO);
}
});
}
@@ -136,6 +136,6 @@
this.baseMapper.deleteById(workGuideId);
workGuideMaterialDAO.delete(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
.eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
- return R.ok();
+ return R.ok();
}
}
--
Gitblit v1.7.1