BJ_FS / urbanops

Commit b494f9b878890baa603f038d3d7da5e4dd7ab3ee

Authored by 王富生
1 parent ec779af5

获取用户昵称

Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java
  View file @b494f9b
@@ -115,9 +115,8 @@ public class DeviceUserServiceImpl implements DeviceUserService { @@ -115,9 +115,8 @@ public class DeviceUserServiceImpl implements DeviceUserService {
115 @DataPermission(enable = false) 115 @DataPermission(enable = false)
116 @Override 116 @Override
117 public PageResult<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) { 117 public PageResult<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) {
118 - Long companyId = SecurityFrameworkUtils.getCompanyId();  
119 - if(companyId !=null){  
120 - pageReqVO.setCompanyId(companyId); 118 + if(pageReqVO.getCompanyId() == null){
  119 + pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
121 } 120 }
122 PageResult<DeviceUserDO> pageResult = deviceUserMapper.selectPage(pageReqVO); 121 PageResult<DeviceUserDO> pageResult = deviceUserMapper.selectPage(pageReqVO);
123 PageResult<DeviceUserRespVO> pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class); 122 PageResult<DeviceUserRespVO> pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class);