From da2db011f72e747af8570cf48c07aa9b5137a643 Mon Sep 17 00:00:00 2001
From: xujun <xu99873273@163.com>
Date: Wed, 3 Jun 2026 11:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=B7=B1=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-app-sys.yaml   | 13 ++++++++-
 .../service/impl/SysOptLogServiceImpl.java    | 29 ++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/xtools-app-standalone/src/main/resources/application-app-sys.yaml b/xtools-app-standalone/src/main/resources/application-app-sys.yaml
index deca5b2..8730f9f 100644
--- a/xtools-app-standalone/src/main/resources/application-app-sys.yaml
+++ b/xtools-app-standalone/src/main/resources/application-app-sys.yaml
@@ -12,5 +12,16 @@ sys:
     max-days: 2
     # 忽略操作日志
     ignore-opt-log:
-      - /sys/dict-item/get-by-code/*
+      # 通用
       - /**/page
+      - /**/tree-table
+      - /**/trees
+      # sys
+      - /sys/dict-item/get-by-code/*
+      - /sys/base/get*
+      - /sys/base/is-ignore-mask
+      - /sys/jar/get-all
+      - /sys/role/all
+      - /sys/monitor/**
+      - /sys/risk/get-ip/*
+      - /sys/risk/get-uri/*
diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java
index d261049..d6252cc 100644
--- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java
+++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java
@@ -26,7 +26,10 @@ import xtools.core.StringUtils;
 import xtools.extend.dto.IpAddrDto;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * <p>Title : SysOptLogServiceImpl</p>
@@ -59,6 +62,12 @@ public class SysOptLogServiceImpl implements SysOptLogService {
     public Result<PageResp<SysOptLogResp>> page(PageReq<SysOptLogPageReq> pageReq) {
         // 分页查询
         Page<SysOptLog> page = getPageData(pageReq.getCurrentPage(), pageReq.getPageSize(), pageReq.getQuery());
+        // 根据返回的ID查询完整数据
+        if (!page.getRecords().isEmpty()) {
+            List<Long> ids = page.getRecords().stream().map(SysOptLog::getId).toList();
+            Map<Long, SysOptLog> recordMap = sysOptLogBaseService.listByIds(ids).stream().collect(Collectors.toMap(SysOptLog::getId, Function.identity()));
+            page.setRecords(ids.stream().map(recordMap::get).filter(Objects::nonNull).toList());
+        }
         // 分装结果
         PageResp<SysOptLogResp> pageResp = new PageResp<>(pageReq, page.getTotal(), sysOptLogConvert.entityToRespList(page.getRecords()));
         return Result.ok(pageResp);
@@ -142,16 +151,16 @@ public class SysOptLogServiceImpl implements SysOptLogService {
         // 查询字段
         query.select(
                 SysOptLog::getId
-                , SysOptLog::getTraceId
-                , SysOptLog::getTitle
-                , SysOptLog::getAccountId
-                , SysOptLog::getAccount
-                , SysOptLog::getIp
-                , SysOptLog::getAddr
-                , SysOptLog::getAddrCode
-                , SysOptLog::getUri
-                , SysOptLog::getMemo
-                , SysOptLog::getGmtCreate
+//                , SysOptLog::getTraceId
+//                , SysOptLog::getTitle
+//                , SysOptLog::getAccountId
+//                , SysOptLog::getAccount
+//                , SysOptLog::getIp
+//                , SysOptLog::getAddr
+//                , SysOptLog::getAddrCode
+//                , SysOptLog::getUri
+//                , SysOptLog::getMemo
+//                , SysOptLog::getGmtCreate
         );
         // 设置查询条件
         setQueryWrapper(query, req);