XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:lanyulei/ferry into dev

Browse Source
This commit is contained in:
lanyulei 2021-06-26 17:18:01 +08:00
commit b8586b83d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/service/createWorkOrder.go
View File

@ -315,7 +315,7 @@ func CreateWorkOrder(c *gin.Context) (err error) {
// 获取需要抄送的邮件 // 获取需要抄送的邮件
emailCCList := make([]string, 0) emailCCList := make([]string, 0)
if len(currentNode["cc"].([]interface{})) > 0 { if currentNode["cc"] != nil && len(currentNode["cc"].([]interface{})) > 0 {
err = orm.Eloquent.Model(&system.SysUser{}). err = orm.Eloquent.Model(&system.SysUser{}).
Where("user_id in (?)", currentNode["cc"]). Where("user_id in (?)", currentNode["cc"]).
Pluck("email", &emailCCList).Error Pluck("email", &emailCCList).Error

2
pkg/service/handle.go
View File

@ -809,7 +809,7 @@ func (h *Handle) HandleWorkOrder(
// 获取需要抄送的邮件 // 获取需要抄送的邮件
emailCCList := make([]string, 0) emailCCList := make([]string, 0)
if len(h.stateValue["cc"].([]interface{})) > 0 { if h.stateValue["cc"] != nil && len(h.stateValue["cc"].([]interface{})) > 0 {
err = orm.Eloquent.Model(&system.SysUser{}). err = orm.Eloquent.Model(&system.SysUser{}).
Where("user_id in (?)", h.stateValue["cc"]). Where("user_id in (?)", h.stateValue["cc"]).
Pluck("email", &emailCCList).Error Pluck("email", &emailCCList).Error