Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/oppmg into dev

@@ -97,14 +97,14 @@ type Template struct {
 }
 
 type AuditFlowConfig struct {
-	NoApprover    int             `json:"no_approver" valid:"Required;"`
-	ProcessConfig []ProcessConfig `json:"process_config"` //创建时 0
+	NoApprover    int             `json:"no_approver" valid:"Required;"` //审核人为空【1:自动通过】【2:转交给管理员】
+	ProcessConfig []ProcessConfig `json:"process_config"`                //创建时 0
 }
 type ProcessConfig struct {
 	ApproveType     int             `json:"approve_type"` //1.部门长 2 指定成员 3.指定角色
-	ProcessType     int             `json:"process_type"`
-	AcitonType      int             `json:"aciton_type"`
-	GroupId         int             `json:"group_id"` //分组id
+	ProcessType     int             `json:"process_type"` //审批类型 1:正常审核  2：特殊审核
+	AcitonType      int             `json:"aciton_type"`  //审批执行方式【1:or】【2:and】
+	GroupId         int             `json:"group_id"`     //分组id
 	FromSpecialUser []VisibleObject `json:"from_special_user"`
 	ToRole          []VisibleObject `json:"to_role"`
 	ToUser          []VisibleObject `json:"to_user"`

@@ -98,7 +98,8 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs
 		for i := range request.AuditFlowConfig.ProcessConfig {
 			config := request.AuditFlowConfig.ProcessConfig[i]
 			flowConfig := &models.AuditFlowConfig{
-				AuditFlowType: config.ProcessType,
+				AuditFlowType: config.ApproveType,
+				FlowType:      config.ProcessType,
 			}
 			if config.ProcessType == models.FlowTypeNormal {
 				flowConfig.Level = normalLevel