|
@ -67,12 +67,17 @@ public class BmsSubjectController { |
|
|
treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); |
|
|
treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); |
|
|
if(StringUtils.hasText(supplierId)){ |
|
|
if(StringUtils.hasText(supplierId)){ |
|
|
BmsSupplier bmsSupplier = bmsSupplierService.getById(supplierId); |
|
|
BmsSupplier bmsSupplier = bmsSupplierService.getById(supplierId); |
|
|
|
|
|
LambdaQueryWrapper<BmsSubject> subjectLqw = new LambdaQueryWrapper<>(); |
|
|
|
|
|
subjectLqw.eq(BmsSubject::getBizRegionFlag,0).or().eq(BmsSubject::getSaleRegionFlag,0); |
|
|
|
|
|
List<BmsSubject> bmsSubjectList = bmsSubjectService.list(subjectLqw); |
|
|
List<BmsSubjectRegion> subjectRegionList = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listBizRegionIds(),1); |
|
|
List<BmsSubjectRegion> subjectRegionList = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listBizRegionIds(),1); |
|
|
List<BmsSubjectRegion> subjectRegionList2 = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listSaleRegionIds(),0); |
|
|
List<BmsSubjectRegion> subjectRegionList2 = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listSaleRegionIds(),0); |
|
|
subjectRegionList.addAll(subjectRegionList2); |
|
|
subjectRegionList.addAll(subjectRegionList2); |
|
|
|
|
|
List<String> subjectIds = bmsSubjectList.stream().map(a->a.getId().toString()).collect(Collectors.toList()); |
|
|
//加载允许适用的科目
|
|
|
//加载允许适用的科目
|
|
|
List<String> subjectIds = subjectRegionList.stream().map(a->a.getSubjectId().toString()) |
|
|
List<String> subjectIds2 = subjectRegionList.stream().map(a->a.getSubjectId().toString()) |
|
|
.distinct().collect(Collectors.toList()); |
|
|
.distinct().collect(Collectors.toList()); |
|
|
|
|
|
subjectIds.addAll(subjectIds2); |
|
|
recursionToSetSelectAble(treeVoList, subjectIds); |
|
|
recursionToSetSelectAble(treeVoList, subjectIds); |
|
|
} |
|
|
} |
|
|
return R.ok(treeVoList); |
|
|
return R.ok(treeVoList); |
|
@ -84,10 +89,13 @@ public class BmsSubjectController { |
|
|
* @param subjectIds |
|
|
* @param subjectIds |
|
|
*/ |
|
|
*/ |
|
|
private void recursionToSetSelectAble(List<?> treeVoList, List<String> subjectIds) { |
|
|
private void recursionToSetSelectAble(List<?> treeVoList, List<String> subjectIds) { |
|
|
|
|
|
if(CollectionUtil.isEmpty(treeVoList)){ |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
for (Object object : treeVoList) { |
|
|
for (Object object : treeVoList) { |
|
|
BmsSubjectTreeVo subjectTreeVo = (BmsSubjectTreeVo)object; |
|
|
BmsSubjectTreeVo subjectTreeVo = (BmsSubjectTreeVo)object; |
|
|
if(subjectTreeVo.getChildren().size()==0){ |
|
|
if(CollectionUtil.isEmpty(subjectTreeVo.getChildren())){ |
|
|
if(subjectTreeVo.getBizRegionFlag().equals(0)&&subjectTreeVo.getSaleRegionFlag().equals(0)){ |
|
|
if(subjectTreeVo.getBizRegionFlag().equals(0)||subjectTreeVo.getSaleRegionFlag().equals(0)){ |
|
|
subjectTreeVo.setApiSelectAble(1); |
|
|
subjectTreeVo.setApiSelectAble(1); |
|
|
}else { |
|
|
}else { |
|
|
for (String subjectId : subjectIds) { |
|
|
for (String subjectId : subjectIds) { |
|
|