|
|
@@ -1,35 +1,43 @@
|
|
|
//
|
|
|
// UserInfo.m
|
|
|
-// MusicGradeExam
|
|
|
//
|
|
|
-// Created by Kyle on 2020/7/10.
|
|
|
-// Copyright © 2020 DayaMusic. All rights reserved.
|
|
|
+// Created by on 2020/7/14
|
|
|
+// Copyright (c) 2020 __MyCompanyName__. All rights reserved.
|
|
|
//
|
|
|
|
|
|
#import "UserInfo.h"
|
|
|
|
|
|
|
|
|
-NSString *const kUserInfoId = @"id";
|
|
|
+NSString *const kUserInfoUserId = @"userId";
|
|
|
+NSString *const kUserInfoUsername = @"username";
|
|
|
+NSString *const kUserInfoSuperAdmin = @"superAdmin";
|
|
|
+NSString *const kUserInfoLockFlag = @"lockFlag";
|
|
|
+NSString *const kUserInfoUpdateTime = @"updateTime";
|
|
|
+NSString *const kUserInfoRealName = @"realName";
|
|
|
+NSString *const kUserInfoUserType = @"userType";
|
|
|
NSString *const kUserInfoWxOpenid = @"wxOpenid";
|
|
|
NSString *const kUserInfoDelFlag = @"delFlag";
|
|
|
-NSString *const kUserInfoPhone = @"phone";
|
|
|
-NSString *const kUserInfoUserType = @"userType";
|
|
|
-NSString *const kUserInfoImToken = @"imToken";
|
|
|
-NSString *const kUserInfoLockFlag = @"lockFlag";
|
|
|
-NSString *const kUserInfoOrganId = @"organId";
|
|
|
-NSString *const kUserInfoQqOpenid = @"qqOpenid";
|
|
|
+NSString *const kUserInfoSysUser = @"sysUser";
|
|
|
NSString *const kUserInfoNation = @"nation";
|
|
|
-NSString *const kUserInfoBirthdate = @"birthdate";
|
|
|
-NSString *const kUserInfoAvatar = @"avatar";
|
|
|
-NSString *const kUserInfoPassword = @"password";
|
|
|
+NSString *const kUserInfoExamNum = @"examNum";
|
|
|
+NSString *const kUserInfoId = @"id";
|
|
|
+NSString *const kUserInfoRoles = @"roles";
|
|
|
NSString *const kUserInfoSalt = @"salt";
|
|
|
-NSString *const kUserInfoCreateTime = @"createTime";
|
|
|
-NSString *const kUserInfoUsername = @"username";
|
|
|
NSString *const kUserInfoEmail = @"email";
|
|
|
NSString *const kUserInfoGender = @"gender";
|
|
|
-NSString *const kUserInfoUpdateTime = @"updateTime";
|
|
|
-NSString *const kUserInfoCurrentGrade = @"currentGrade";
|
|
|
-NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
+NSString *const kUserInfoPhone = @"phone";
|
|
|
+NSString *const kUserInfoBirthdate = @"birthdate";
|
|
|
+NSString *const kUserInfoOrganId = @"organId";
|
|
|
+NSString *const kUserInfoAvatar = @"avatar";
|
|
|
+NSString *const kUserInfoIsSuperAdmin = @"isSuperAdmin";
|
|
|
+NSString *const kUserInfoImToken = @"imToken";
|
|
|
+NSString *const kUserInfoCreateTime = @"createTime";
|
|
|
+NSString *const kUserInfoCertificatePhoto = @"certificatePhoto";
|
|
|
+NSString *const kUserInfoPassword = @"password";
|
|
|
+NSString *const kUserInfoQqOpenid = @"qqOpenid";
|
|
|
+NSString *const kUserInfoIdCardNo = @"idCardNo";
|
|
|
+NSString *const kUserInfoWechatId = @"wechatId";
|
|
|
+
|
|
|
|
|
|
@interface UserInfo ()
|
|
|
|
|
|
@@ -40,26 +48,35 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
@implementation UserInfo
|
|
|
|
|
|
@synthesize userId = _userId;
|
|
|
+@synthesize username = _username;
|
|
|
+@synthesize superAdmin = _superAdmin;
|
|
|
+@synthesize lockFlag = _lockFlag;
|
|
|
+@synthesize updateTime = _updateTime;
|
|
|
+@synthesize realName = _realName;
|
|
|
+@synthesize userType = _userType;
|
|
|
@synthesize wxOpenid = _wxOpenid;
|
|
|
@synthesize delFlag = _delFlag;
|
|
|
-@synthesize phone = _phone;
|
|
|
-@synthesize userType = _userType;
|
|
|
-@synthesize imToken = _imToken;
|
|
|
-@synthesize lockFlag = _lockFlag;
|
|
|
-@synthesize organId = _organId;
|
|
|
-@synthesize qqOpenid = _qqOpenid;
|
|
|
+@synthesize sysUser = _sysUser;
|
|
|
@synthesize nation = _nation;
|
|
|
-@synthesize birthdate = _birthdate;
|
|
|
-@synthesize avatar = _avatar;
|
|
|
-@synthesize password = _password;
|
|
|
+@synthesize examNum = _examNum;
|
|
|
+@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
|
|
|
+@synthesize roles = _roles;
|
|
|
@synthesize salt = _salt;
|
|
|
-@synthesize createTime = _createTime;
|
|
|
-@synthesize username = _username;
|
|
|
@synthesize email = _email;
|
|
|
@synthesize gender = _gender;
|
|
|
-@synthesize updateTime = _updateTime;
|
|
|
-@synthesize currentGrade = _currentGrade;
|
|
|
-@synthesize currentClass = _currentClass;
|
|
|
+@synthesize phone = _phone;
|
|
|
+@synthesize birthdate = _birthdate;
|
|
|
+@synthesize organId = _organId;
|
|
|
+@synthesize avatar = _avatar;
|
|
|
+@synthesize isSuperAdmin = _isSuperAdmin;
|
|
|
+@synthesize imToken = _imToken;
|
|
|
+@synthesize createTime = _createTime;
|
|
|
+@synthesize certificatePhoto = _certificatePhoto;
|
|
|
+@synthesize password = _password;
|
|
|
+@synthesize qqOpenid = _qqOpenid;
|
|
|
+@synthesize idCardNo = _idCardNo;
|
|
|
+@synthesize wechatId = _wechatId;
|
|
|
+
|
|
|
|
|
|
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
|
|
|
{
|
|
|
@@ -73,27 +90,35 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
// This check serves to make sure that a non-NSDictionary object
|
|
|
// passed into the model class doesn't break the parsing.
|
|
|
if(self && [dict isKindOfClass:[NSDictionary class]]) {
|
|
|
- self.userId = [[self objectOrNilForKey:kUserInfoId fromDictionary:dict] doubleValue];
|
|
|
- self.wxOpenid = [self objectOrNilForKey:kUserInfoWxOpenid fromDictionary:dict];
|
|
|
- self.delFlag = [self objectOrNilForKey:kUserInfoDelFlag fromDictionary:dict];
|
|
|
- self.phone = [self objectOrNilForKey:kUserInfoPhone fromDictionary:dict];
|
|
|
+ self.userId = [[self objectOrNilForKey:kUserInfoUserId fromDictionary:dict] doubleValue];
|
|
|
+ self.username = [self objectOrNilForKey:kUserInfoUsername fromDictionary:dict];
|
|
|
+ self.superAdmin = [[self objectOrNilForKey:kUserInfoSuperAdmin fromDictionary:dict] boolValue];
|
|
|
+ self.lockFlag = [[self objectOrNilForKey:kUserInfoLockFlag fromDictionary:dict] doubleValue];
|
|
|
+ self.updateTime = [self objectOrNilForKey:kUserInfoUpdateTime fromDictionary:dict];
|
|
|
+ self.realName = [self objectOrNilForKey:kUserInfoRealName fromDictionary:dict];
|
|
|
self.userType = [self objectOrNilForKey:kUserInfoUserType fromDictionary:dict];
|
|
|
- self.imToken = [self objectOrNilForKey:kUserInfoImToken fromDictionary:dict];
|
|
|
- self.lockFlag = [self objectOrNilForKey:kUserInfoLockFlag fromDictionary:dict];
|
|
|
- self.organId = [[self objectOrNilForKey:kUserInfoOrganId fromDictionary:dict] doubleValue];
|
|
|
- self.qqOpenid = [self objectOrNilForKey:kUserInfoQqOpenid fromDictionary:dict];
|
|
|
+ self.wxOpenid = [self objectOrNilForKey:kUserInfoWxOpenid fromDictionary:dict];
|
|
|
+ self.delFlag = [[self objectOrNilForKey:kUserInfoDelFlag fromDictionary:dict] doubleValue];
|
|
|
+ self.sysUser = [SysUser modelObjectWithDictionary:[dict objectForKey:kUserInfoSysUser]];
|
|
|
self.nation = [self objectOrNilForKey:kUserInfoNation fromDictionary:dict];
|
|
|
- self.birthdate = [self objectOrNilForKey:kUserInfoBirthdate fromDictionary:dict];
|
|
|
- self.avatar = [self objectOrNilForKey:kUserInfoAvatar fromDictionary:dict];
|
|
|
- self.password = [self objectOrNilForKey:kUserInfoPassword fromDictionary:dict];
|
|
|
+ self.examNum = [[self objectOrNilForKey:kUserInfoExamNum fromDictionary:dict] doubleValue];
|
|
|
+ self.internalBaseClassIdentifier = [[self objectOrNilForKey:kUserInfoId fromDictionary:dict] doubleValue];
|
|
|
+ self.roles = [[self objectOrNilForKey:kUserInfoRoles fromDictionary:dict] doubleValue];
|
|
|
self.salt = [self objectOrNilForKey:kUserInfoSalt fromDictionary:dict];
|
|
|
- self.createTime = [self objectOrNilForKey:kUserInfoCreateTime fromDictionary:dict];
|
|
|
- self.username = [self objectOrNilForKey:kUserInfoUsername fromDictionary:dict];
|
|
|
self.email = [self objectOrNilForKey:kUserInfoEmail fromDictionary:dict];
|
|
|
self.gender = [[self objectOrNilForKey:kUserInfoGender fromDictionary:dict] doubleValue];
|
|
|
- self.updateTime = [self objectOrNilForKey:kUserInfoUpdateTime fromDictionary:dict];
|
|
|
- self.currentGrade = [self objectOrNilForKey:kUserInfoCurrentGrade fromDictionary:dict];
|
|
|
- self.currentClass = [self objectOrNilForKey:kUserInfoCurrentClass fromDictionary:dict];
|
|
|
+ self.phone = [self objectOrNilForKey:kUserInfoPhone fromDictionary:dict];
|
|
|
+ self.birthdate = [self objectOrNilForKey:kUserInfoBirthdate fromDictionary:dict];
|
|
|
+ self.organId = [[self objectOrNilForKey:kUserInfoOrganId fromDictionary:dict] doubleValue];
|
|
|
+ self.avatar = [self objectOrNilForKey:kUserInfoAvatar fromDictionary:dict];
|
|
|
+ self.isSuperAdmin = [[self objectOrNilForKey:kUserInfoIsSuperAdmin fromDictionary:dict] boolValue];
|
|
|
+ self.imToken = [self objectOrNilForKey:kUserInfoImToken fromDictionary:dict];
|
|
|
+ self.createTime = [self objectOrNilForKey:kUserInfoCreateTime fromDictionary:dict];
|
|
|
+ self.certificatePhoto = [self objectOrNilForKey:kUserInfoCertificatePhoto fromDictionary:dict];
|
|
|
+ self.password = [self objectOrNilForKey:kUserInfoPassword fromDictionary:dict];
|
|
|
+ self.qqOpenid = [self objectOrNilForKey:kUserInfoQqOpenid fromDictionary:dict];
|
|
|
+ self.idCardNo = [self objectOrNilForKey:kUserInfoIdCardNo fromDictionary:dict];
|
|
|
+ self.wechatId = [self objectOrNilForKey:kUserInfoWechatId fromDictionary:dict];
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -104,32 +129,40 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
- (NSDictionary *)dictionaryRepresentation
|
|
|
{
|
|
|
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
|
|
|
- [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kUserInfoId];
|
|
|
- [mutableDict setValue:self.wxOpenid forKey:kUserInfoWxOpenid];
|
|
|
- [mutableDict setValue:self.delFlag forKey:kUserInfoDelFlag];
|
|
|
- [mutableDict setValue:self.phone forKey:kUserInfoPhone];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kUserInfoUserId];
|
|
|
+ [mutableDict setValue:self.username forKey:kUserInfoUsername];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithBool:self.superAdmin] forKey:kUserInfoSuperAdmin];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.lockFlag] forKey:kUserInfoLockFlag];
|
|
|
+ [mutableDict setValue:self.updateTime forKey:kUserInfoUpdateTime];
|
|
|
+ [mutableDict setValue:self.realName forKey:kUserInfoRealName];
|
|
|
[mutableDict setValue:self.userType forKey:kUserInfoUserType];
|
|
|
- [mutableDict setValue:self.imToken forKey:kUserInfoImToken];
|
|
|
- [mutableDict setValue:self.lockFlag forKey:kUserInfoLockFlag];
|
|
|
- [mutableDict setValue:[NSNumber numberWithDouble:self.organId] forKey:kUserInfoOrganId];
|
|
|
- [mutableDict setValue:self.qqOpenid forKey:kUserInfoQqOpenid];
|
|
|
+ [mutableDict setValue:self.wxOpenid forKey:kUserInfoWxOpenid];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.delFlag] forKey:kUserInfoDelFlag];
|
|
|
+ [mutableDict setValue:[self.sysUser dictionaryRepresentation] forKey:kUserInfoSysUser];
|
|
|
[mutableDict setValue:self.nation forKey:kUserInfoNation];
|
|
|
- [mutableDict setValue:self.birthdate forKey:kUserInfoBirthdate];
|
|
|
- [mutableDict setValue:self.avatar forKey:kUserInfoAvatar];
|
|
|
- [mutableDict setValue:self.password forKey:kUserInfoPassword];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.examNum] forKey:kUserInfoExamNum];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kUserInfoId];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.roles] forKey:kUserInfoRoles];
|
|
|
[mutableDict setValue:self.salt forKey:kUserInfoSalt];
|
|
|
- [mutableDict setValue:self.createTime forKey:kUserInfoCreateTime];
|
|
|
- [mutableDict setValue:self.username forKey:kUserInfoUsername];
|
|
|
[mutableDict setValue:self.email forKey:kUserInfoEmail];
|
|
|
[mutableDict setValue:[NSNumber numberWithDouble:self.gender] forKey:kUserInfoGender];
|
|
|
- [mutableDict setValue:self.updateTime forKey:kUserInfoUpdateTime];
|
|
|
- [mutableDict setValue:self.currentGrade forKey:kUserInfoCurrentGrade];
|
|
|
- [mutableDict setValue:self.currentClass forKey:kUserInfoCurrentClass];
|
|
|
-
|
|
|
+ [mutableDict setValue:self.phone forKey:kUserInfoPhone];
|
|
|
+ [mutableDict setValue:self.birthdate forKey:kUserInfoBirthdate];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithDouble:self.organId] forKey:kUserInfoOrganId];
|
|
|
+ [mutableDict setValue:self.avatar forKey:kUserInfoAvatar];
|
|
|
+ [mutableDict setValue:[NSNumber numberWithBool:self.isSuperAdmin] forKey:kUserInfoIsSuperAdmin];
|
|
|
+ [mutableDict setValue:self.imToken forKey:kUserInfoImToken];
|
|
|
+ [mutableDict setValue:self.createTime forKey:kUserInfoCreateTime];
|
|
|
+ [mutableDict setValue:self.certificatePhoto forKey:kUserInfoCertificatePhoto];
|
|
|
+ [mutableDict setValue:self.password forKey:kUserInfoPassword];
|
|
|
+ [mutableDict setValue:self.qqOpenid forKey:kUserInfoQqOpenid];
|
|
|
+ [mutableDict setValue:self.idCardNo forKey:kUserInfoIdCardNo];
|
|
|
+ [mutableDict setValue:self.wechatId forKey:kUserInfoWechatId];
|
|
|
+
|
|
|
return [NSDictionary dictionaryWithDictionary:mutableDict];
|
|
|
}
|
|
|
|
|
|
-- (NSString *)description
|
|
|
+- (NSString *)description
|
|
|
{
|
|
|
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
|
|
|
}
|
|
|
@@ -138,10 +171,6 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
|
|
|
{
|
|
|
id object = [dict objectForKey:aKey];
|
|
|
- if ([object isKindOfClass:[NSNumber class]]) {
|
|
|
- NSNumber *number = object;
|
|
|
- object = [number stringValue];
|
|
|
- }
|
|
|
return [object isEqual:[NSNull null]] ? nil : object;
|
|
|
}
|
|
|
|
|
|
@@ -152,54 +181,70 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
{
|
|
|
self = [super init];
|
|
|
|
|
|
- self.userId = [aDecoder decodeDoubleForKey:kUserInfoId];
|
|
|
- self.wxOpenid = [aDecoder decodeObjectForKey:kUserInfoWxOpenid];
|
|
|
- self.delFlag = [aDecoder decodeObjectForKey:kUserInfoDelFlag];
|
|
|
- self.phone = [aDecoder decodeObjectForKey:kUserInfoPhone];
|
|
|
+ self.userId = [aDecoder decodeDoubleForKey:kUserInfoUserId];
|
|
|
+ self.username = [aDecoder decodeObjectForKey:kUserInfoUsername];
|
|
|
+ self.superAdmin = [aDecoder decodeBoolForKey:kUserInfoSuperAdmin];
|
|
|
+ self.lockFlag = [aDecoder decodeDoubleForKey:kUserInfoLockFlag];
|
|
|
+ self.updateTime = [aDecoder decodeObjectForKey:kUserInfoUpdateTime];
|
|
|
+ self.realName = [aDecoder decodeObjectForKey:kUserInfoRealName];
|
|
|
self.userType = [aDecoder decodeObjectForKey:kUserInfoUserType];
|
|
|
- self.imToken = [aDecoder decodeObjectForKey:kUserInfoImToken];
|
|
|
- self.lockFlag = [aDecoder decodeObjectForKey:kUserInfoLockFlag];
|
|
|
- self.organId = [aDecoder decodeDoubleForKey:kUserInfoOrganId];
|
|
|
- self.qqOpenid = [aDecoder decodeObjectForKey:kUserInfoQqOpenid];
|
|
|
+ self.wxOpenid = [aDecoder decodeObjectForKey:kUserInfoWxOpenid];
|
|
|
+ self.delFlag = [aDecoder decodeDoubleForKey:kUserInfoDelFlag];
|
|
|
+ self.sysUser = [aDecoder decodeObjectForKey:kUserInfoSysUser];
|
|
|
self.nation = [aDecoder decodeObjectForKey:kUserInfoNation];
|
|
|
- self.birthdate = [aDecoder decodeObjectForKey:kUserInfoBirthdate];
|
|
|
- self.avatar = [aDecoder decodeObjectForKey:kUserInfoAvatar];
|
|
|
- self.password = [aDecoder decodeObjectForKey:kUserInfoPassword];
|
|
|
+ self.examNum = [aDecoder decodeDoubleForKey:kUserInfoExamNum];
|
|
|
+ self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kUserInfoId];
|
|
|
+ self.roles = [aDecoder decodeDoubleForKey:kUserInfoRoles];
|
|
|
self.salt = [aDecoder decodeObjectForKey:kUserInfoSalt];
|
|
|
- self.createTime = [aDecoder decodeObjectForKey:kUserInfoCreateTime];
|
|
|
- self.username = [aDecoder decodeObjectForKey:kUserInfoUsername];
|
|
|
self.email = [aDecoder decodeObjectForKey:kUserInfoEmail];
|
|
|
self.gender = [aDecoder decodeDoubleForKey:kUserInfoGender];
|
|
|
- self.updateTime = [aDecoder decodeObjectForKey:kUserInfoUpdateTime];
|
|
|
- self.currentGrade = [aDecoder decodeObjectForKey:kUserInfoCurrentGrade];
|
|
|
- self.currentClass = [aDecoder decodeObjectForKey:kUserInfoCurrentClass];
|
|
|
+ self.phone = [aDecoder decodeObjectForKey:kUserInfoPhone];
|
|
|
+ self.birthdate = [aDecoder decodeObjectForKey:kUserInfoBirthdate];
|
|
|
+ self.organId = [aDecoder decodeDoubleForKey:kUserInfoOrganId];
|
|
|
+ self.avatar = [aDecoder decodeObjectForKey:kUserInfoAvatar];
|
|
|
+ self.isSuperAdmin = [aDecoder decodeBoolForKey:kUserInfoIsSuperAdmin];
|
|
|
+ self.imToken = [aDecoder decodeObjectForKey:kUserInfoImToken];
|
|
|
+ self.createTime = [aDecoder decodeObjectForKey:kUserInfoCreateTime];
|
|
|
+ self.certificatePhoto = [aDecoder decodeObjectForKey:kUserInfoCertificatePhoto];
|
|
|
+ self.password = [aDecoder decodeObjectForKey:kUserInfoPassword];
|
|
|
+ self.qqOpenid = [aDecoder decodeObjectForKey:kUserInfoQqOpenid];
|
|
|
+ self.idCardNo = [aDecoder decodeObjectForKey:kUserInfoIdCardNo];
|
|
|
+ self.wechatId = [aDecoder decodeObjectForKey:kUserInfoWechatId];
|
|
|
return self;
|
|
|
}
|
|
|
|
|
|
- (void)encodeWithCoder:(NSCoder *)aCoder
|
|
|
{
|
|
|
|
|
|
- [aCoder encodeDouble:_userId forKey:kUserInfoId];
|
|
|
- [aCoder encodeObject:_wxOpenid forKey:kUserInfoWxOpenid];
|
|
|
- [aCoder encodeObject:_delFlag forKey:kUserInfoDelFlag];
|
|
|
- [aCoder encodeObject:_phone forKey:kUserInfoPhone];
|
|
|
+ [aCoder encodeDouble:_userId forKey:kUserInfoUserId];
|
|
|
+ [aCoder encodeObject:_username forKey:kUserInfoUsername];
|
|
|
+ [aCoder encodeBool:_superAdmin forKey:kUserInfoSuperAdmin];
|
|
|
+ [aCoder encodeDouble:_lockFlag forKey:kUserInfoLockFlag];
|
|
|
+ [aCoder encodeObject:_updateTime forKey:kUserInfoUpdateTime];
|
|
|
+ [aCoder encodeObject:_realName forKey:kUserInfoRealName];
|
|
|
[aCoder encodeObject:_userType forKey:kUserInfoUserType];
|
|
|
- [aCoder encodeObject:_imToken forKey:kUserInfoImToken];
|
|
|
- [aCoder encodeObject:_lockFlag forKey:kUserInfoLockFlag];
|
|
|
- [aCoder encodeDouble:_organId forKey:kUserInfoOrganId];
|
|
|
- [aCoder encodeObject:_qqOpenid forKey:kUserInfoQqOpenid];
|
|
|
+ [aCoder encodeObject:_wxOpenid forKey:kUserInfoWxOpenid];
|
|
|
+ [aCoder encodeDouble:_delFlag forKey:kUserInfoDelFlag];
|
|
|
+ [aCoder encodeObject:_sysUser forKey:kUserInfoSysUser];
|
|
|
[aCoder encodeObject:_nation forKey:kUserInfoNation];
|
|
|
- [aCoder encodeObject:_birthdate forKey:kUserInfoBirthdate];
|
|
|
- [aCoder encodeObject:_avatar forKey:kUserInfoAvatar];
|
|
|
- [aCoder encodeObject:_password forKey:kUserInfoPassword];
|
|
|
+ [aCoder encodeDouble:_examNum forKey:kUserInfoExamNum];
|
|
|
+ [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kUserInfoId];
|
|
|
+ [aCoder encodeDouble:_roles forKey:kUserInfoRoles];
|
|
|
[aCoder encodeObject:_salt forKey:kUserInfoSalt];
|
|
|
- [aCoder encodeObject:_createTime forKey:kUserInfoCreateTime];
|
|
|
- [aCoder encodeObject:_username forKey:kUserInfoUsername];
|
|
|
[aCoder encodeObject:_email forKey:kUserInfoEmail];
|
|
|
[aCoder encodeDouble:_gender forKey:kUserInfoGender];
|
|
|
- [aCoder encodeObject:_updateTime forKey:kUserInfoUpdateTime];
|
|
|
- [aCoder encodeObject:_currentGrade forKey:kUserInfoCurrentGrade];
|
|
|
- [aCoder encodeObject:_currentClass forKey:kUserInfoCurrentClass];
|
|
|
+ [aCoder encodeObject:_phone forKey:kUserInfoPhone];
|
|
|
+ [aCoder encodeObject:_birthdate forKey:kUserInfoBirthdate];
|
|
|
+ [aCoder encodeDouble:_organId forKey:kUserInfoOrganId];
|
|
|
+ [aCoder encodeObject:_avatar forKey:kUserInfoAvatar];
|
|
|
+ [aCoder encodeBool:_isSuperAdmin forKey:kUserInfoIsSuperAdmin];
|
|
|
+ [aCoder encodeObject:_imToken forKey:kUserInfoImToken];
|
|
|
+ [aCoder encodeObject:_createTime forKey:kUserInfoCreateTime];
|
|
|
+ [aCoder encodeObject:_certificatePhoto forKey:kUserInfoCertificatePhoto];
|
|
|
+ [aCoder encodeObject:_password forKey:kUserInfoPassword];
|
|
|
+ [aCoder encodeObject:_qqOpenid forKey:kUserInfoQqOpenid];
|
|
|
+ [aCoder encodeObject:_idCardNo forKey:kUserInfoIdCardNo];
|
|
|
+ [aCoder encodeObject:_wechatId forKey:kUserInfoWechatId];
|
|
|
}
|
|
|
|
|
|
- (id)copyWithZone:(NSZone *)zone
|
|
|
@@ -209,26 +254,34 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
if (copy) {
|
|
|
|
|
|
copy.userId = self.userId;
|
|
|
- copy.wxOpenid = [self.wxOpenid copyWithZone:zone];
|
|
|
- copy.delFlag = [self.delFlag copyWithZone:zone];
|
|
|
- copy.phone = [self.phone copyWithZone:zone];
|
|
|
+ copy.username = [self.username copyWithZone:zone];
|
|
|
+ copy.superAdmin = self.superAdmin;
|
|
|
+ copy.lockFlag = self.lockFlag;
|
|
|
+ copy.updateTime = [self.updateTime copyWithZone:zone];
|
|
|
+ copy.realName = [self.realName copyWithZone:zone];
|
|
|
copy.userType = [self.userType copyWithZone:zone];
|
|
|
- copy.imToken = [self.imToken copyWithZone:zone];
|
|
|
- copy.lockFlag = [self.lockFlag copyWithZone:zone];
|
|
|
- copy.organId = self.organId;
|
|
|
- copy.qqOpenid = [self.qqOpenid copyWithZone:zone];
|
|
|
+ copy.wxOpenid = [self.wxOpenid copyWithZone:zone];
|
|
|
+ copy.delFlag = self.delFlag;
|
|
|
+ copy.sysUser = [self.sysUser copyWithZone:zone];
|
|
|
copy.nation = [self.nation copyWithZone:zone];
|
|
|
- copy.birthdate = [self.birthdate copyWithZone:zone];
|
|
|
- copy.avatar = [self.avatar copyWithZone:zone];
|
|
|
- copy.password = [self.password copyWithZone:zone];
|
|
|
+ copy.examNum = self.examNum;
|
|
|
+ copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
|
|
|
+ copy.roles = self.roles;
|
|
|
copy.salt = [self.salt copyWithZone:zone];
|
|
|
- copy.createTime = [self.createTime copyWithZone:zone];
|
|
|
- copy.username = [self.username copyWithZone:zone];
|
|
|
copy.email = [self.email copyWithZone:zone];
|
|
|
copy.gender = self.gender;
|
|
|
- copy.updateTime = [self.updateTime copyWithZone:zone];
|
|
|
- copy.currentGrade = [self.currentGrade copyWithZone:zone];
|
|
|
- copy.currentClass = [self.currentClass copyWithZone:zone];
|
|
|
+ copy.phone = [self.phone copyWithZone:zone];
|
|
|
+ copy.birthdate = [self.birthdate copyWithZone:zone];
|
|
|
+ copy.organId = self.organId;
|
|
|
+ copy.avatar = [self.avatar copyWithZone:zone];
|
|
|
+ copy.isSuperAdmin = self.isSuperAdmin;
|
|
|
+ copy.imToken = [self.imToken copyWithZone:zone];
|
|
|
+ copy.createTime = [self.createTime copyWithZone:zone];
|
|
|
+ copy.certificatePhoto = [self.certificatePhoto copyWithZone:zone];
|
|
|
+ copy.password = [self.password copyWithZone:zone];
|
|
|
+ copy.qqOpenid = [self.qqOpenid copyWithZone:zone];
|
|
|
+ copy.idCardNo = [self.idCardNo copyWithZone:zone];
|
|
|
+ copy.wechatId = [self.wechatId copyWithZone:zone];
|
|
|
}
|
|
|
|
|
|
return copy;
|
|
|
@@ -236,4 +289,3 @@ NSString *const kUserInfoCurrentClass = @"currentClass";
|
|
|
|
|
|
|
|
|
@end
|
|
|
-
|
Steven
