Commit 5bbf0511 by xieshaohua

[修改]boss 登录adid更新

parent 33d10192
......@@ -112,6 +112,7 @@ public class LoginManagement {
String userName = resultData.get("employeeNumber") == null ? "" : String.valueOf(resultData.get("employeeNumber"));
String userDName = resultData.get("chineseName") == null ? "" : String.valueOf(resultData.get("chineseName"));
String eid = resultData.get("eid") == null ? "" : String.valueOf(resultData.get("eid"));
String adid = resultData.get("adid") == null ? "" : String.valueOf(resultData.get("adid"));
Map<String, Object> user = getUserByName(userName);
log.info("匹配用户:{}" , user == null ? "" : JSON.toJSONString(user));
......@@ -122,6 +123,7 @@ public class LoginManagement {
toAdd.put("name", userName);
toAdd.put("dname", userDName);
toAdd.put("eid", eid);
toAdd.put("adid", adid);
toAdd.put("password", "37fa265330ad83eaa879efb1e2db6380896cf639");
List<Map<String, Object>> dataRoleAbstracts = new ArrayList<>();
Map<String, Object> roleMap = new HashMap<>();
......@@ -136,6 +138,7 @@ public class LoginManagement {
user.put("name", userName);
user.put("dname", userDName);
user.put("eid", eid);
user.put("adid", adid);
log.info("更新用户:{}", JSON.toJSONString(user));
authService.updateUser(userId, user);
}
......@@ -294,19 +297,25 @@ public class LoginManagement {
String ssoUserName = ssoUserData.get("employeeNumber") == null ? "" : String.valueOf(ssoUserData.get("employeeNumber"));
String ssoUserDName = ssoUserData.get("chineseName") == null ? "" : String.valueOf(ssoUserData.get("chineseName"));
String ssoEid = ssoUserData.get("eid") == null ? "" : String.valueOf(ssoUserData.get("eid"));
String ssoAdid = ssoUserData.get("adid") == null ? "" : String.valueOf(ssoUserData.get("adid"));
String userName = user.get("name") == null ? "" : String.valueOf(user.get("name"));
String dname = user.get("dname") == null ? "" : String.valueOf(user.get("dname"));
String eid = user.get("eid") == null ? "" : String.valueOf(user.get("eid"));
String adid = user.get("adid") == null ? "" : String.valueOf(user.get("adid"));
log.info("ssoUserName:{},ssoUserDName:{},ssoEid:{}",ssoUserName,ssoUserDName,ssoEid);
log.info("userName:{},dname:{},eid:{}",userName,dname,eid);
log.info("ssoUserName:{},ssoUserDName:{},ssoEid:{},ssoAdid:{}", ssoUserName, ssoUserDName, ssoEid, ssoAdid);
log.info("userName:{},dname:{},eid:{},adid:{}", userName, dname, eid, adid, adid);
if (!StringUtils.equals(ssoUserName, userName) || !StringUtils.equals(ssoUserDName, dname)
|| !StringUtils.equals(ssoEid, eid)) {
return true;
}
if (!StringUtils.equals(ssoUserName, userName) || !StringUtils.equals(ssoUserDName, dname)
|| !StringUtils.equals(ssoAdid, adid)) {
return true;
}
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment