1.pms电站终端调整
This commit is contained in:
@@ -227,7 +227,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
|
|||||||
public Page<StatationStatVO> getStatationStatPageList(TerminalQueryParam baseParam) {
|
public Page<StatationStatVO> getStatationStatPageList(TerminalQueryParam baseParam) {
|
||||||
List<String> orgIds = new ArrayList<>();
|
List<String> orgIds = new ArrayList<>();
|
||||||
if(StrUtil.isNotBlank(baseParam.getOrgId())){
|
if(StrUtil.isNotBlank(baseParam.getOrgId())){
|
||||||
orgIds.addAll(deptFeignClient.getDepSonSelfCodetByCode(baseParam.getOrgId()).getData());
|
orgIds.addAll(deptFeignClient.getDepSonSelfCodetByDeptId(baseParam.getOrgId()).getData());
|
||||||
}
|
}
|
||||||
return this.baseMapper.getStatationStatPageList(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), baseParam,orgIds);
|
return this.baseMapper.getStatationStatPageList(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), baseParam,orgIds);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
|
|||||||
|
|
||||||
List<String> orgIds = new ArrayList<>();
|
List<String> orgIds = new ArrayList<>();
|
||||||
if(StrUtil.isNotBlank(baseParam.getOrgId())){
|
if(StrUtil.isNotBlank(baseParam.getOrgId())){
|
||||||
orgIds.addAll(deptFeignClient.getDepSonSelfCodetByCode(baseParam.getOrgId()).getData());
|
orgIds.addAll(deptFeignClient.getDepSonSelfCodetByDeptId(baseParam.getOrgId()).getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user