From 10ac3bf55a7c1e741deac4d5b94cb303f0bd9dca Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Fri, 25 Aug 2023 09:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml,=E8=80=81=E5=B8=88?= =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E5=8F=AA=E8=83=BD=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AD=A6=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysTrainingScoreServiceImpl.java | 2 +- .../resources/mapper/system/SysUserMapper.xml | 45 +++++++++++-------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java index 1849b1a..4f705dc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java @@ -168,7 +168,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { } } } - PageInfo pageInfo = new PageInfo<>(); + PageInfo pageInfo = new PageInfo<>(reportDtoList); pageInfo.setTotal(total2); return pageInfo; } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 0beab46..98107ee 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -87,17 +87,23 @@ @@ -108,22 +114,24 @@