...
|
...
|
@@ -610,6 +610,12 @@ func ChanceUpdate(header *protocol.RequestHeader, request *protocol.ChanceUpdate |
|
|
return
|
|
|
}
|
|
|
}
|
|
|
//发送提交日志
|
|
|
if err = agg.SaveApproveLog(orm, 1, header.UserId, chance.Id); err != nil {
|
|
|
log.Error(err)
|
|
|
orm.Rollback()
|
|
|
return
|
|
|
}
|
|
|
if len(auditFlows) > 0 {
|
|
|
//7.发送审批实例给审批服务器
|
|
|
if m, e := suplusApprove.NewApproveInstance(header, auditFlows); e != nil {
|
...
|
...
|
@@ -731,7 +737,7 @@ func ChanceChangePublish(header *protocol.RequestHeader, request *protocol.Chanc |
|
|
}
|
|
|
}
|
|
|
|
|
|
if err = saveApproveMsgChangePublic(orm, chance, request.PublicData); err != nil {
|
|
|
if err = saveApproveMsgChangePublic(header, orm, chance, request.PublicData); err != nil {
|
|
|
log.Error(err)
|
|
|
orm.Rollback()
|
|
|
return
|
...
|
...
|
@@ -743,7 +749,7 @@ func ChanceChangePublish(header *protocol.RequestHeader, request *protocol.Chanc |
|
|
}
|
|
|
|
|
|
//发送审核日志
|
|
|
func saveApproveMsgChangePublic(orm orm.Ormer, chance *models.Chance, approveData protocol.PublicData) (err error) {
|
|
|
func saveApproveMsgChangePublic(header *protocol.RequestHeader, orm orm.Ormer, chance *models.Chance, approveData protocol.PublicData) (err error) {
|
|
|
var (
|
|
|
parames = make([]interface{}, 0)
|
|
|
code = 0
|
...
|
...
|
@@ -760,7 +766,7 @@ func saveApproveMsgChangePublic(orm orm.Ormer, chance *models.Chance, approveDat |
|
|
}
|
|
|
parames = append(parames, strings.Join(department, ","))
|
|
|
}
|
|
|
if err = agg.SaveApproveLog(orm, code, chance.UserId, chance.Id, parames...); err != nil {
|
|
|
if err = agg.SaveApproveLog(orm, code, header.UserId, chance.Id, parames...); err != nil {
|
|
|
log.Error(err)
|
|
|
return
|
|
|
}
|
...
|
...
|
|