From 38273fe5894b298a13f13fed6a6279d5beca71b4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 10:13:16 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
index 5dc54d5..5f75693 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
@@ -53,27 +53,20 @@
return R.fail("数据异常");
}
ProjectRelationVO projectRelationVO=new ProjectRelationVO();
- ComActSocialProject comActSocialProject=this.comActSocialProjectDao.selectById(commonPage.getParamId());
- if(comActSocialProject.getLevel()==1){
- ComActSocialProject comActSocialProject1=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject.getParentId()));
- if(comActSocialProject1!=null){
- SocialProjectVO socialProjectVO=new SocialProjectVO();
- BeanUtils.copyProperties(comActSocialProject1,socialProjectVO);
- projectRelationVO.setFatherProjectLevelOne(socialProjectVO);
- }
-
- }
+ SocialProjectVO comActSocialProject=this.comActSocialProjectDao.selectByLevel(commonPage.getParamId());
if(comActSocialProject.getLevel()==2){
- ComActSocialProject comActSocialProject1=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject.getParentId()));
+ SocialProjectVO comActSocialProject1=this.comActSocialProjectDao.selectByLevel(comActSocialProject.getParentId());
if(comActSocialProject1!=null){
- SocialProjectVO socialProjectVO=new SocialProjectVO();
- BeanUtils.copyProperties(comActSocialProject1,socialProjectVO);
- projectRelationVO.setFatherProjectLevelTwo(socialProjectVO);
- ComActSocialProject comActSocialProject2=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject1.getParentId()));
+ projectRelationVO.setFatherProjectLevelOne(comActSocialProject1);
+ }
+ }
+ if(comActSocialProject.getLevel()==3){
+ SocialProjectVO comActSocialProject1=this.comActSocialProjectDao.selectByLevel(comActSocialProject.getParentId());
+ if(comActSocialProject1!=null){
+ projectRelationVO.setFatherProjectLevelTwo(comActSocialProject1);
+ SocialProjectVO comActSocialProject2=this.comActSocialProjectDao.selectByLevel(comActSocialProject1.getParentId());
if(comActSocialProject2!=null){
- SocialProjectVO socialProjectVO1=new SocialProjectVO();
- BeanUtils.copyProperties(comActSocialProject2,socialProjectVO1);
- projectRelationVO.setFatherProjectLevelOne(socialProjectVO1);
+ projectRelationVO.setFatherProjectLevelOne(comActSocialProject2);
}
}
}
--
Gitblit v1.7.1