mmm-go / oppmg · 提交

转到一个项目

作者 yangfu
提交 c95683fcaed7a8731bf6a33cb213e4dd7fe84798 1 个父辈 8bb578d2

公告直接发布，发布给所有人

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 1 行删除
@@ -111,6 +111,8 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs @@ -111,6 +111,8 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs
111 flowConfig.ToRole = jsonAssertMarsh(getIdsFrom(config.ToRole)) 111 flowConfig.ToRole = jsonAssertMarsh(getIdsFrom(config.ToRole))
112 flowConfig.ToUser = jsonAssertMarsh(getIdsFrom(config.ToUser)) 112 flowConfig.ToUser = jsonAssertMarsh(getIdsFrom(config.ToUser))
113 flowConfig.ActionType = config.AcitonType 113 flowConfig.ActionType = config.AcitonType
  114 + //flowConfig.FlowType = config.ProcessType
  115 + //flowConfig.AuditFlowType = config.ApproveType
114 flowConfig.CreateAt = time.Now() 116 flowConfig.CreateAt = time.Now()
115 flowConfig.AuditGroupId = int64(config.GroupId) 117 flowConfig.AuditGroupId = int64(config.GroupId)
116 flowConfig.ConfigData = jsonAssertMarsh(config) 118 flowConfig.ConfigData = jsonAssertMarsh(config)
@@ -220,7 +222,7 @@ func TemplateUpdate(uid, companyId int64, request *protocol.TemplateUpdateReques @@ -220,7 +222,7 @@ func TemplateUpdate(uid, companyId int64, request *protocol.TemplateUpdateReques
220 for i := range request.AuditFlowConfig.ProcessConfig { 222 for i := range request.AuditFlowConfig.ProcessConfig {
221 config := request.AuditFlowConfig.ProcessConfig[i] 223 config := request.AuditFlowConfig.ProcessConfig[i]
222 flowConfig := &models.AuditFlowConfig{ 224 flowConfig := &models.AuditFlowConfig{
223 - AuditFlowType: config.ProcessType, 225 + //AuditFlowType: config.ApproveType,
224 } 226 }
225 if config.ProcessType == models.FlowTypeNormal { 227 if config.ProcessType == models.FlowTypeNormal {
226 flowConfig.Level = normalLevel 228 flowConfig.Level = normalLevel
@@ -233,6 +235,8 @@ func TemplateUpdate(uid, companyId int64, request *protocol.TemplateUpdateReques @@ -233,6 +235,8 @@ func TemplateUpdate(uid, companyId int64, request *protocol.TemplateUpdateReques
233 flowConfig.ToRole = jsonAssertMarsh(getIdsFrom(config.ToRole)) 235 flowConfig.ToRole = jsonAssertMarsh(getIdsFrom(config.ToRole))
234 flowConfig.ToUser = jsonAssertMarsh(getIdsFrom(config.ToUser)) 236 flowConfig.ToUser = jsonAssertMarsh(getIdsFrom(config.ToUser))
235 flowConfig.ActionType = config.AcitonType 237 flowConfig.ActionType = config.AcitonType
  238 + flowConfig.FlowType = config.ProcessType
  239 + flowConfig.AuditFlowType = config.ApproveType
236 flowConfig.CreateAt = time.Now() 240 flowConfig.CreateAt = time.Now()
237 flowConfig.AuditGroupId = int64(config.GroupId) 241 flowConfig.AuditGroupId = int64(config.GroupId)
238 flowConfig.ConfigData = jsonAssertMarsh(config) 242 flowConfig.ConfigData = jsonAssertMarsh(config)