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<ReportDto> pageInfo = new PageInfo<>();
+            PageInfo<ReportDto> 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 @@
     </sql>
 
     <select id="selectClassStuNumberName" resultMap="SysUserResult">
-        SELECT studentnumber, stuclass, user_name, user_id
-        FROM sys_user
+        SELECT su.studentnumber, su.stuclass, su.user_name, su.user_id
+        FROM sys_user su
+                 JOIN sys_user_role sur ON su.user_id = sur.user_id
+                 JOIN sys_role sr ON sur.role_id = sr.role_id
+        WHERE sr.role_id = 2
     </select>
 
     <select id="selectClassStuNumberNameByClass" resultMap="SysUserResult">
-        SELECT studentnumber, stuclass, user_name, user_id
-        FROM sys_user
+        SELECT su.studentnumber, su.stuclass, su.user_name, su.user_id
+        FROM sys_user su
+        JOIN sys_user_role sur ON su.user_id = sur.user_id
+        JOIN sys_role sr ON sur.role_id = sr.role_id
         <where>
-            <if test="stuClass != null and stuClass !=''">
-                AND stuclass = #{stuClass}
+            <if test="stuClass != null and stuClass != ''">
+                AND su.stuclass = #{stuClass}
             </if>
+            AND sr.role_id = 2
         </where>
     </select>
 
@@ -108,22 +114,24 @@
 
 
     <select id="selectByNameStuNum" resultMap="SysUserResult">
-        SELECT studentnumber,stuclass,user_name,user_id
-        FROM sys_user
-        <where>
-            <if test="stuClass != null and stuClass !=''">
-                AND stuclass = #{stuClass}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                AND (user_name like "%"#{keyWord}"%" or studentnumber like "%"#{keyWord}"%")
-            </if>
-        </where>
+        SELECT su.studentnumber, su.stuclass, su.user_name, su.user_id
+        FROM sys_user su
+        JOIN sys_user_role sur ON su.user_id = sur.user_id
+        JOIN sys_role sr ON sur.role_id = sr.role_id
+        WHERE sr.role_id = 2
+        <if test="stuClass != null and stuClass !=''">
+            AND stuclass = #{stuClass}
+        </if>
+        <if test="keyWord != null and keyWord != ''">
+            AND (user_name like "%"#{keyWord}"%" or studentnumber like "%"#{keyWord}"%")
+        </if>
     </select>
 
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
-        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader ,u.studentnumber,u.stuclass from sys_user
+        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        ,u.studentnumber,u.stuclass from sys_user
         u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
@@ -154,7 +162,8 @@
     </select>
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,  u.studentnumber,u.stuclass
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,
+        u.studentnumber,u.stuclass
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id