Commit 7ec26f2f authored by tianyiming's avatar tianyiming

修改bug

parent 7051e71a
...@@ -229,10 +229,17 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -229,10 +229,17 @@ public class SupervisionConfigureController extends AbstractBaseController {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize()); if(ObjectUtils.isEmpty(bizOrgCode)){
if (StringUtils.isEmpty(bizOrgCode)) { ReginParams reginParams = getSelectedOrgInfo();
return CommonResponseUtil.success(null); ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) {
bizOrgCode = personIdentity.getBizOrgCode();
if (bizOrgCode == null) {
return CommonResponseUtil.success(null);
}
}
} }
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
Page<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null); Page<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null);
List<Long> ids = new ArrayList(); List<Long> ids = new ArrayList();
pressurePumpInfo.getRecords().stream().map(item -> { pressurePumpInfo.getRecords().stream().map(item -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment