Merge remote-tracking branch 'origin/debug' into 0.0.1

services/admin.go

@@ -58,6 +58,7 @@ func GetAdminUserItemByOpenId(openid string) (item *custom.AdminWx, err error) {
 			}
 			err = ERR_ADMIN_NOT_BIND
 			adminRecord.UserId = 0
+			item = &custom.AdminWx{}
 			//格式化返回用户数据
 			formatWxUserAndUserRecord(item, adminRecord)
 			return
@@ -250,7 +251,11 @@ QUERY_WX_USER:
 	} else {
 		token = tokenItem.AccessToken
 		//如果联系人编号不为空，且联系人编号与session里面的联系人编号不一致的时候，需要做session变更
-		if adminId > 0 && tokenItem.AdminId != adminId {
+		//if adminId > 0 && tokenItem.AdminId != adminId {
+		//	_ = h5_admin_session.UpdateSession(tokenItem.SessionId, adminId, time.Now().AddDate(0, 1, 0))
+		//}
+		//如果联系人编号与session里面的联系人编号不一致的时候，需要做session变更
+		if tokenItem.AdminId != adminId {
 			_ = h5_admin_session.UpdateSession(tokenItem.SessionId, adminId, time.Now().AddDate(0, 1, 0))
 		}
 	}