|
@@ -227,7 +227,8 @@ public class UserService extends JedisUtil {
|
227
|
227
|
ResultVo resultVo = null;
|
228
|
228
|
String loginpwd = user.getLoginpwd();
|
229
|
229
|
setLoginPwd(user);
|
230
|
|
- String mac = user.getMac();
|
|
230
|
+ String mac = user.getMac().toUpperCase();
|
|
231
|
+ user.setMac(mac);
|
231
|
232
|
UserVo userVo = userMapper.getUserByLoginnameMac(user.getLoginname(), mac);
|
232
|
233
|
|
233
|
234
|
if (userVo != null && userVo.getUserid() > 0) {
|
|
@@ -235,6 +236,11 @@ public class UserService extends JedisUtil {
|
235
|
236
|
user.setUsername(userVo.getUsername());
|
236
|
237
|
user.setSchoolid(userVo.getSchoolid());
|
237
|
238
|
user.setUsertype(userVo.getUsertype());
|
|
239
|
+ if(N_Utils.isNotEmpty(userVo.getMac())){
|
|
240
|
+ String userVoMac = userVo.getMac().toUpperCase();
|
|
241
|
+ userVo.setMac(userVoMac);
|
|
242
|
+ }
|
|
243
|
+
|
238
|
244
|
//验证学生登录系列问题
|
239
|
245
|
resultVo = checkLoginStudent(user, userVo);
|
240
|
246
|
} else {
|