|
|
@@ -99,17 +99,29 @@ func (l *LoginByWeixinLogic) LoginByWeixin(req types.LoginByWeixinRequest) (*typ
|
|
|
logx.Error(err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- //关联兼职
|
|
|
- partTime := new(model.I2billMktPartTimeXorm)
|
|
|
- _, err = l.svcCtx.DB.Where("ipone_number = ? and del_flag = 0 and user_id = 0", rtnInfo.UserInfo.Mobile).Get(partTime)
|
|
|
+ erpUser, err := model.GetAcquirePerm(rtnInfo.UserInfo.ID, l.svcCtx.Transformer, l.svcCtx.DB)
|
|
|
if err != nil {
|
|
|
logx.Error(err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- partTime.UserId = rtnInfo.UserInfo.ID
|
|
|
- if partTime.Id != 0 {
|
|
|
- l.svcCtx.DB.ID(partTime.Id).Update(partTime)
|
|
|
+ //关联兼职
|
|
|
+ if erpUser == nil || erpUser.UserId == "" {
|
|
|
+ partTime := new(model.I2billMktPartTimeXorm)
|
|
|
+ _, err = l.svcCtx.DB.Where("ipone_number = ? and del_flag = 0 and user_id = 0", rtnInfo.UserInfo.Mobile).Get(partTime)
|
|
|
+ if err != nil {
|
|
|
+ logx.Error(err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ partTime.UserId = rtnInfo.UserInfo.ID
|
|
|
+ if partTime.Id != 0 {
|
|
|
+ _, err := l.svcCtx.DB.ID(partTime.Id).Update(partTime)
|
|
|
+ if err != nil {
|
|
|
+ logx.Error(err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
rtnInfo.Token = accessToken
|
|
|
return &rtnInfo, nil
|
|
|
}
|