From b494f9b878890baa603f038d3d7da5e4dd7ab3ee Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sun, 25 Jan 2026 23:12:55 +0800
Subject: [PATCH] 获取用户昵称

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) {
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
-        if(companyId !=null){
-            pageReqVO.setCompanyId(companyId);
+        if(pageReqVO.getCompanyId() == null){
+            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         }
         PageResult<DeviceUserDO> pageResult = deviceUserMapper.selectPage(pageReqVO);
         PageResult<DeviceUserRespVO> pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class);
--
libgit2 0.21.4