From 323764c813a09cd56cdab780155ef659dbe0b364 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 11 八月 2026 15:08:03 +0800
Subject: [PATCH] update
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
index cc3d2da..d8683f7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.mapper.SysVisitAreaMapper;
import com.ruoyi.system.mapper.SysVisitorMachineMapper;
import com.ruoyi.system.service.ISysVisitorMachineService;
+import com.ruoyi.system.utils.AreaIdUtils;
import com.ruoyi.system.vo.SysVisitorMachineVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,11 +46,13 @@
public PageInfo<SysVisitorMachineVO> pageList(SysVisitorMachinePageRequest request)
{
SysVisitorMachinePageRequest query = request == null ? new SysVisitorMachinePageRequest() : request;
+ query.setAreaId(StringUtils.trim(query.getAreaId()));
query.setDeviceName(StringUtils.trim(query.getDeviceName()));
query.setDeviceId(StringUtils.trim(query.getDeviceId()));
query.setOnlineStatus(StringUtils.trim(query.getOnlineStatus()));
PageInfo<SysVisitorMachineVO> pageInfo = new PageInfo<SysVisitorMachineVO>(query.getPageNum(), query.getPageSize());
- List<SysVisitorMachineVO> list = visitorMachineMapper.pageList(query, pageInfo);
+ List<SysVisitorMachineVO> list = visitorMachineMapper.pageList(query,
+ AreaIdUtils.parseLocalAreaId(query.getAreaId()), pageInfo);
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1