|
@@ -1,6 +1,7 @@
|
1
|
1
|
package com.xhkjedu.suser.service.system;
|
2
|
2
|
|
3
|
3
|
import com.alibaba.fastjson.JSON;
|
|
4
|
+import com.alibaba.fastjson.JSONObject;
|
4
|
5
|
import com.xhkjedu.suser.config.ConfigKey;
|
5
|
6
|
import com.xhkjedu.suser.mapper.gradeclass.ClassMapper;
|
6
|
7
|
import com.xhkjedu.suser.mapper.subjectbook.TeacherPowersbMapper;
|
|
@@ -755,16 +756,8 @@ public class LoginService extends JedisUtil{
|
755
|
756
|
|
756
|
757
|
resultVo = getLogResultVo(user, resultVo, loginpwd, request);
|
757
|
758
|
if(resultVo.getCode() == 0){
|
758
|
|
- Map<String,Object> rtnMap = new LinkedHashMap<>();
|
759
|
|
- rtnMap.put("userid",userVo.getUserid());
|
760
|
|
- rtnMap.put("username",userVo.getUsername());
|
761
|
|
- rtnMap.put("loginname",userVo.getLoginname());
|
762
|
|
- rtnMap.put("studentno",userVo.getStudentno());
|
763
|
|
- rtnMap.put("cardid",userVo.getCardid());
|
764
|
|
- rtnMap.put("userphone",userVo.getUserphone());
|
765
|
|
- rtnMap.put("schoolid",userVo.getSchoolid());
|
|
759
|
+ Map<String,Object> rtnMap = JSONObject.parseObject(JSONObject.toJSONString(userVo));
|
766
|
760
|
rtnMap.put("schoolName",userVo.getSchoolname());
|
767
|
|
- rtnMap.put("usersex", userVo.getUsersex());
|
768
|
761
|
|
769
|
762
|
//获取学生当前所在行政班
|
770
|
763
|
ClassVo classVo = classMapper.getXzClassByUserid(userVo.getUserid());
|