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

@@ -75,7 +75,7 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs
 				CompanyId:       int(companyId),
 				CompanyId:       int(companyId),
 				AuditTemplateId: int(templateId),
 				AuditTemplateId: int(templateId),
 				Section:         input.SectionType,
 				Section:         input.SectionType,
-				SortNum:         input.Sort,
+				SortNum:         i,
 				Label:           input.Label,
 				Label:           input.Label,
 				InputType:       input.InputType,
 				InputType:       input.InputType,
 				Required:        int8(input.Required),
 				Required:        int8(input.Required),
@@ -207,6 +207,7 @@ func TemplateUpdate(uid, companyId int64, request *protocol.TemplateUpdateReques
 		}
 		}
 		for i := range request.Template.InputList {
 		for i := range request.Template.InputList {
 			input := request.Template.InputList[i]
 			input := request.Template.InputList[i]
+			input.Sort = i
 			if err = insertOrUpdateInput(orm, companyId, int(template.Id), input); err != nil {
 			if err = insertOrUpdateInput(orm, companyId, int(template.Id), input); err != nil {
 				log.Error(err.Error())
 				log.Error(err.Error())
 				orm.Rollback()
 				orm.Rollback()
@@ -291,6 +292,7 @@ func insertOrUpdateInput(orm orm2.Ormer, companyId int64, templateId int, input
 			"Label":     input.Label,
 			"Label":     input.Label,
 			"InputType": input.InputType,
 			"InputType": input.InputType,
 			"Required":  int8(input.Required),
 			"Required":  int8(input.Required),
+			"SortNum":   input.Sort,
 		}
 		}
 		if err = utils.UpdateTableByMapWithOrmer(orm, auditForm, updateMap); err != nil {
 		if err = utils.UpdateTableByMapWithOrmer(orm, auditForm, updateMap); err != nil {
 			return
 			return
@@ -338,9 +340,11 @@ func TemplateList(uid, companyId int64, request *protocol.TemplateListRequest) (
 			//	log.Error(err.Error())
 			//	log.Error(err.Error())
 			//	return
 			//	return
 			//}
 			//}
+			if len(temp.VisibleObject) > 0 {
 				if e := json.Unmarshal([]byte(temp.VisibleObject), &vObj); e != nil {
 				if e := json.Unmarshal([]byte(temp.VisibleObject), &vObj); e != nil {
 					log.Error("%v %v %v", temp.Id, temp.VisibleObject, e.Error())
 					log.Error("%v %v %v", temp.Id, temp.VisibleObject, e.Error())
 				}
 				}
+			}
 			tempItem := &protocol.TemplateItem{
 			tempItem := &protocol.TemplateItem{
 				Id:            temp.Id,
 				Id:            temp.Id,
 				Name:          temp.Name,
 				Name:          temp.Name,