Merge branch 'dev' of github.com:lanyulei/ferry into dev
This commit is contained in:
commit
b8586b83d5
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user