获取用户昵称

王富生
1 parent 7a11a28e
Showing 2 changed files with 6 additions and 0 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/deviceuser/DeviceUserMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java
@@ -27,6 +27,8 @@ public interface DeviceUserMapper extends BaseMapperX&lt;DeviceUserDO&gt; {
                 .eqIfPresent(DeviceUserDO::getDeviceNo, reqVO.getDeviceNo())
                 .likeIfPresent(DeviceUserDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(DeviceUserDO::getDeviceState, reqVO.getDeviceState())
+                .eqIfPresent(DeviceUserDO::getCompanyId, reqVO.getCompanyId())
+
                 .orderByDesc(DeviceUserDO::getId));
     }
  
@@ -115,6 +115,10 @@ public class DeviceUserServiceImpl implements DeviceUserService {
     @DataPermission(enable = false)
     @Override
     public PageResult<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) {
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if(companyId !=null){
+            pageReqVO.setCompanyId(companyId);
+        }
         PageResult<DeviceUserDO> pageResult = deviceUserMapper.selectPage(pageReqVO);
         PageResult<DeviceUserRespVO> pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class);
         if(CollectionUtil.isEmpty(pageResultVO.getList())){