diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java index 63667f4..86f81ed 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java @@ -115,9 +115,8 @@ public class DeviceUserServiceImpl implements DeviceUserService { @DataPermission(enable = false) @Override public PageResult getDeviceUserPage(DeviceUserPageReqVO pageReqVO) { - Long companyId = SecurityFrameworkUtils.getCompanyId(); - if(companyId !=null){ - pageReqVO.setCompanyId(companyId); + if(pageReqVO.getCompanyId() == null){ + pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); } PageResult pageResult = deviceUserMapper.selectPage(pageReqVO); PageResult pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class);