修改初始化树bug
This commit is contained in:
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
|
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
|
||||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
|
||||||
import com.njcn.common.pojo.exception.BusinessException;
|
import com.njcn.common.pojo.exception.BusinessException;
|
||||||
import com.njcn.device.pms.pojo.po.StatationStat;
|
import com.njcn.device.pms.pojo.po.StatationStat;
|
||||||
import com.njcn.minioss.bo.MinIoUploadResDTO;
|
import com.njcn.minioss.bo.MinIoUploadResDTO;
|
||||||
@@ -614,7 +613,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result = result.stream ( ).filter (temp -> Objects.equals (temp.getId ( ), orgdid)).collect (Collectors.toList ( ));
|
result = recursion(result,orgdid);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -647,4 +646,19 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
|
|||||||
return rSurveyCycleVO;
|
return rSurveyCycleVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<DeptSubstationVO> recursion ( List<DeptSubstationVO> result,String orgdid){
|
||||||
|
|
||||||
|
List<DeptSubstationVO> finalResult = new ArrayList<> ();
|
||||||
|
for (DeptSubstationVO deptSubstationVO : result) {
|
||||||
|
if(Objects.equals (deptSubstationVO.getId (),orgdid)){
|
||||||
|
finalResult.add (deptSubstationVO);
|
||||||
|
return finalResult;
|
||||||
|
}else {
|
||||||
|
List<DeptSubstationVO> recursion = recursion (deptSubstationVO.getChildren ( ), orgdid);
|
||||||
|
return recursion;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user