From fc855f524ba0c8dc3222da76d28b38afbac69fe0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 18:35:25 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 be42b0b..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,16 +83,16 @@
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);
}
});
}
- return null;
+ return R.ok();
}
@Override
@@ -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