Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-27 d06074d9aef25964902e1a126129ab032e04c542

Merge remote-tracking branch 'origin/master'

 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();
    }
}