diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/deviceuser/DeviceUserMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/deviceuser/DeviceUserMapper.java
index e1ccf58..93cb632 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/deviceuser/DeviceUserMapper.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/deviceuser/DeviceUserMapper.java
@@ -27,6 +27,8 @@ public interface DeviceUserMapper extends BaseMapperX<DeviceUserDO> {
                 .eqIfPresent(DeviceUserDO::getDeviceNo, reqVO.getDeviceNo())
                 .likeIfPresent(DeviceUserDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(DeviceUserDO::getDeviceState, reqVO.getDeviceState())
+                .eqIfPresent(DeviceUserDO::getCompanyId, reqVO.getCompanyId())
+
                 .orderByDesc(DeviceUserDO::getId));
     }
 
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 3f2fab7..63667f4 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,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())){