From 0d24fe840f3cd6a0b04d3f1ba1a98ba7fee1d395 Mon Sep 17 00:00:00 2001
From: jack_rabbit <376168706@qq.com>
Date: Sat, 18 Jan 2020 17:08:46 +0800
Subject: [PATCH] 1.添加学生，键盘号班内唯一，学号校内唯一

---
 resources/mybatis1/sunvote/StudentMapper.xml                 | 2 +-
 src/com/fh/controller/sunvote/student/StudentController.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index 41d7d90..23d264c 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -109,7 +109,7 @@ FROM
 WHERE
 	( NUMBER = #{NUMBER} AND sv_sclass.SCHOOL_ID = #{SCHOOL_ID} )
 	OR 
-	( KEYPAD_ID = #{KEYPAD_ID} AND sv_sclass.SCHOOL_ID = #{SCHOOL_ID})
+	( KEYPAD_ID = #{KEYPAD_ID} AND sv_sclass.ID = #{CLASS_ID})
 	</select>
 	<!-- 通过ID获取数据 -->
 	<select id="findByClassId" parameterType="pd" resultType="pd">
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index e5d891a..4d71f67 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -173,6 +173,7 @@ public class StudentController extends BaseController {
 						}
 					}
 					savePd.put("SCHOOL_ID", tpd.get("SCHOOL_ID"));
+					savePd.put("CLASS_ID", classID);
 					List<PageData> lnum = studentService.findByNumberAndKeyPadId(savePd);
 					
 					if(lnum.size()<1){
--
libgit2 0.21.4