作者 yangfu

审核人修改

@@ -97,14 +97,14 @@ type Template struct { @@ -97,14 +97,14 @@ type Template struct {
97 } 97 }
98 98
99 type AuditFlowConfig struct { 99 type AuditFlowConfig struct {
100 - NoApprover int `json:"no_approver" valid:"Required;"`  
101 - ProcessConfig []ProcessConfig `json:"process_config"` //创建时 0 100 + NoApprover int `json:"no_approver" valid:"Required;"` //审核人为空【1:自动通过】【2:转交给管理员】
  101 + ProcessConfig []ProcessConfig `json:"process_config"` //创建时 0
102 } 102 }
103 type ProcessConfig struct { 103 type ProcessConfig struct {
104 ApproveType int `json:"approve_type"` //1.部门长 2 指定成员 3.指定角色 104 ApproveType int `json:"approve_type"` //1.部门长 2 指定成员 3.指定角色
105 - ProcessType int `json:"process_type"`  
106 - AcitonType int `json:"aciton_type"`  
107 - GroupId int `json:"group_id"` //分组id 105 + ProcessType int `json:"process_type"` //审批类型 1:正常审核 2:特殊审核
  106 + AcitonType int `json:"aciton_type"` //审批执行方式【1:or】【2:and】
  107 + GroupId int `json:"group_id"` //分组id
108 FromSpecialUser []VisibleObject `json:"from_special_user"` 108 FromSpecialUser []VisibleObject `json:"from_special_user"`
109 ToRole []VisibleObject `json:"to_role"` 109 ToRole []VisibleObject `json:"to_role"`
110 ToUser []VisibleObject `json:"to_user"` 110 ToUser []VisibleObject `json:"to_user"`
@@ -98,7 +98,8 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs @@ -98,7 +98,8 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs
98 for i := range request.AuditFlowConfig.ProcessConfig { 98 for i := range request.AuditFlowConfig.ProcessConfig {
99 config := request.AuditFlowConfig.ProcessConfig[i] 99 config := request.AuditFlowConfig.ProcessConfig[i]
100 flowConfig := &models.AuditFlowConfig{ 100 flowConfig := &models.AuditFlowConfig{
101 - AuditFlowType: config.ProcessType, 101 + AuditFlowType: config.ApproveType,
  102 + FlowType: config.ProcessType,
102 } 103 }
103 if config.ProcessType == models.FlowTypeNormal { 104 if config.ProcessType == models.FlowTypeNormal {
104 flowConfig.Level = normalLevel 105 flowConfig.Level = normalLevel