|
@@ -164,23 +164,23 @@ class UserModel extends BaseModel {
|
|
|
* @return {Promise}
|
|
|
*/
|
|
|
async markUser(userData, request = null) {
|
|
|
- let userDataFromDb2 = await this.findDataBySsoId(userData.ssoId);
|
|
|
- let userDataFromDb = await this.findDataByName(userData.username); //后面新增的账号可淘汰这方法,当前使用是为了兼容旧的账号
|
|
|
+ let userDataFromDb = await this.findDataBySsoId(userData.ssoId);
|
|
|
+ // let userDataFromDb = await this.findDataByName(userData.username); //后面新增的账号可淘汰这方法,当前使用是为了兼容旧的账号
|
|
|
let result = false;
|
|
|
userData.latest_login = new Date().getTime();
|
|
|
- if (userDataFromDb === null && userDataFromDb2 === null) {
|
|
|
+ if (userDataFromDb === null) {
|
|
|
// 不存在用户则入库
|
|
|
this.setScene();//恢复场景,用户有可能公司real_name等信息为空,不能设置为必填
|
|
|
result = await this.addUser(userData);
|
|
|
userDataFromDb = result;
|
|
|
} else {
|
|
|
// 存在则新增登录信息并更新账号信息
|
|
|
- // let condition = {ssoId: sessionUser.ssoId};
|
|
|
- let condition = {username: userData.username};
|
|
|
+ let condition = {ssoId: userData.ssoId};
|
|
|
+ // let condition = {username: userData.username};
|
|
|
let UpdateData = {
|
|
|
email : userData.email,
|
|
|
mobile : userData.mobile,
|
|
|
- ssoId : userData.ssoId,
|
|
|
+ // ssoId : userData.ssoId,
|
|
|
qq: userData.qq,
|
|
|
latest_login:userData.latest_login,
|
|
|
isUserActive: userData.isUserActive,
|