fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
momo 2023-11-07 18:41:08 +08:00
commit 3641a40a69
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/gmodel/fs_feishu_user_gen.go
View File

@ -30,6 +30,7 @@ type FsFeishuUser struct {
EmployeeNo *string `gorm:"default:'';" json:"employee_no"` // EmployeeNo *string `gorm:"default:'';" json:"employee_no"` //
EmployeeType *int64 `gorm:"default:0;" json:"employee_type"` // 0:未设置 1：正式员工 2：实习生 3：外包 4：劳务 5：顾问 EmployeeType *int64 `gorm:"default:0;" json:"employee_type"` // 0:未设置 1：正式员工 2：实习生 3：外包 4：劳务 5：顾问
Orders *[]byte `gorm:"default:'';" json:"orders"` // Orders *[]byte `gorm:"default:'';" json:"orders"` //
JoinTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"join_time"` //
Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` // Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` //
Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` //
} }

1
model/gmodel/fs_feishu_user_logic.go
View File

@ -26,5 +26,6 @@ func (u *FsFeishuUserModel) CreateOrUpdate(ctx context.Context, appId, openId st
} }
return err return err
} }
data.Ctime = nil
return u.Update(ctx, data) return u.Update(ctx, data)
} }

2
server/feishu-sync/internal/logic/user_webhook.go
View File

@ -115,6 +115,7 @@ func (l *WebhookLogic) OnUserChange(data []byte) error {
return err return err
} }
feiShuMsgCreateTime := time.UnixMilli(feiShuMsgCreateTimeInt64) feiShuMsgCreateTime := time.UnixMilli(feiShuMsgCreateTimeInt64)
joinTime := time.Unix(msg.Event.Object.Joint64ime, 0)
return l.svcCtx.AllModels.FsFeishuUser.CreateOrUpdate(l.ctx, msg.Header.AppId, msg.Event.Object.OpenId, &gmodel.FsFeishuUser{ return l.svcCtx.AllModels.FsFeishuUser.CreateOrUpdate(l.ctx, msg.Header.AppId, msg.Event.Object.OpenId, &gmodel.FsFeishuUser{
AppId: &msg.Header.AppId, AppId: &msg.Header.AppId,
OpenId: &msg.Event.Object.OpenId, OpenId: &msg.Event.Object.OpenId,
@ -138,6 +139,7 @@ func (l *WebhookLogic) OnUserChange(data []byte) error {
EmployeeNo: &msg.Event.Object.EmployeeNo, EmployeeNo: &msg.Event.Object.EmployeeNo,
EmployeeType: &msg.Event.Object.EmployeeType, EmployeeType: &msg.Event.Object.EmployeeType,
Orders: &orders, Orders: &orders,
JoinTime: &joinTime,
Ctime: &feiShuMsgCreateTime, Ctime: &feiShuMsgCreateTime,
Utime: &feiShuMsgCreateTime, Utime: &feiShuMsgCreateTime,
}) })