|
|
|
@ -155,11 +155,11 @@ public class UserController {
|
|
|
|
|
map.put("name", loginResult.getName());
|
|
|
|
|
|
|
|
|
|
StuUserExample stuUserExample = new StuUserExample();
|
|
|
|
|
stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andZyUseridEqualTo(Integer.parseInt(loginResult.getUserId()));
|
|
|
|
|
stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andUsernameEqualTo(loginResult.getUsername());
|
|
|
|
|
List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
|
|
|
|
|
String userid = stuUsers.get(0).getUserid();
|
|
|
|
|
map.put("username", loginResult.getUsername());
|
|
|
|
|
map.put("roleId", loginResult.getRoleId());
|
|
|
|
|
map.put("roleId", String.valueOf(loginResult.getRoleId()));
|
|
|
|
|
map.put("schoolId", loginResult.getSchoolId());
|
|
|
|
|
if (StringUtils.isNotBlank(loginResult.getUserId())) {
|
|
|
|
|
map.put("classId", loginResult.getClassId());
|
|
|
|
@ -239,7 +239,7 @@ public class UserController {
|
|
|
|
|
String password = zyUserInfo.getPassword();
|
|
|
|
|
|
|
|
|
|
StuUserExample example = new StuUserExample();
|
|
|
|
|
example.createCriteria().andZyUseridEqualTo(zyUserId).andSystemOnwerEqualTo(systemOwner);
|
|
|
|
|
example.createCriteria().andUsernameEqualTo(username).andSystemOnwerEqualTo(systemOwner);
|
|
|
|
|
List<StuUser> list = stuUserMapper.selectByExample(example);
|
|
|
|
|
if (!list.isEmpty()) {
|
|
|
|
|
continue;
|
|
|
|
|