From 22d8bba17835f4726b0d54e969ba350bb971ecaf Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Thu, 17 Jan 2019 01:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E9=83=A8=E5=88=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/exam/controller/ApiExaminationController.java    | 4 ++--
 .../resources/mapper/exam/ExamUserExaminationMapper.xml    | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java
index 9a28626a6..0d284a02b 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java
@@ -291,9 +291,9 @@ public class ApiExaminationController extends BaseController {
     @GetMapping("/v1/user/examination/page")
     public AjaxResult userexamination(ExamUserExaminationVO bean) {
         SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() );
-        bean.setVipUserId( Integer.parseInt( sysUser.getUserId().toString() ) );
+        bean.setVipUserId( sysUser.getUserId().intValue() );
         List<ExamUserExaminationVO> data = examUserExaminationService.selectMyExamUserExamination( bean );
-        AjaxResult success = success( "考试完成" );
+        AjaxResult success = success( "查询列表成功" );
         success.put( "data", data );
         return success;
     }
diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserExaminationMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserExaminationMapper.xml
index 29a35c68f..40a0c608f 100644
--- a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserExaminationMapper.xml
+++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserExaminationMapper.xml
@@ -141,13 +141,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateDate != null "> and update_date = #{updateDate}</if>
             <if test="remarks != null  and remarks != '' "> and remarks = #{remarks}</if>
             <if test="delFlag != null  and delFlag != '' "> and del_flag = #{delFlag}</if>
-
-
-
             <if test="userName != null  and userName != '' "> and su.user_name = #{userName}</if>
-            <if test="trainCourseName != null  and trainCourseName != '' "> and tc.name = #{trainCourseName}</if>
+            <if test="examExaminationVO != null  and examExaminationVO.trainCourseName != null  and examExaminationVO.trainCourseName != '' "> and tc.name = #{examExaminationVO.trainCourseName}</if>
             <if test="examPaperName != null  and examPaperName != '' "> and ep.name = #{examPaperName}</if>
-            <if test="type != null  and type != '' "> and ee.type = #{type}</if>
+            <if test="examExaminationVO!=null and examExaminationVO.type != null  and examExaminationVO.type != '' "> and ee.type = #{examExaminationVO.type}</if>
 
         </where>