Merge branch 'dev' into test

@@ -20,6 +20,8 @@ func (srv ContractChangeLogService) ContractChangeLogSearch(queryParam *query.Li
 		PageSize:                  queryParam.PageSize,
 		PageSize:                  queryParam.PageSize,
 		CooperationContractNumber: queryParam.CooperationContractNumber,
 		CooperationContractNumber: queryParam.CooperationContractNumber,
 		OperationType:             queryParam.OperationType,
 		OperationType:             queryParam.OperationType,
+		OrgIds:                    queryParam.Operator.OrgIds,
+		CompanyId:                 int(queryParam.Operator.CompanyId),
 	})
 	})
 	listData := dto.ToContractChangeLogList(result)
 	listData := dto.ToContractChangeLogList(result)
 	return result.Grid.Total, listData, err
 	return result.Grid.Total, listData, err

@@ -48,7 +48,7 @@ type UpdateCooperationContractCommand struct {
 	// 金额激励规则列表
 	// 金额激励规则列表
 	MoneyIncentivesRules []struct {
 	MoneyIncentivesRules []struct {
 		// 金额激励规则ID
 		// 金额激励规则ID
-		MoneyIncentivesRuleId int64 `json:"moneyIncentivesRuleId,string,"`
+		MoneyIncentivesRuleId string `json:"moneyIncentivesRuleId"`
 		// 关联的共创合约编号
 		// 关联的共创合约编号
 		CooperationContractNumber string `json:"cooperationContractNumber"`
 		CooperationContractNumber string `json:"cooperationContractNumber"`
 		// 激励金额
 		// 激励金额

 package service
 package service
 
 
 import (
 import (
+	"strconv"
 	"time"
 	"time"
 
 
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
@@ -138,7 +139,9 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationContractCommand.Operator)
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationContractCommand.Operator)
 	rules1 := []allied_creation_cooperation.DividendsIncentivesRule{}
 	rules1 := []allied_creation_cooperation.DividendsIncentivesRule{}
 	for _, v := range updateCooperationContractCommand.DividendsIncentivesRules {
 	for _, v := range updateCooperationContractCommand.DividendsIncentivesRules {
+		id, _ := strconv.Atoi(v.DividendsIncentivesRuleId)
 		r := allied_creation_cooperation.DividendsIncentivesRule{
 		r := allied_creation_cooperation.DividendsIncentivesRule{
+			DividendsIncentivesRuleId:     id,
 			CooperationContractNumber:     v.CooperationContractNumber,
 			CooperationContractNumber:     v.CooperationContractNumber,
 			ReferrerPercentage:            v.ReferrerPercentage,
 			ReferrerPercentage:            v.ReferrerPercentage,
 			SalesmanPercentage:            v.SalesmanPercentage,
 			SalesmanPercentage:            v.SalesmanPercentage,
@@ -152,8 +155,9 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 	}
 	}
 	rules2 := []allied_creation_cooperation.MoneyIncentivesRule{}
 	rules2 := []allied_creation_cooperation.MoneyIncentivesRule{}
 	for _, v := range updateCooperationContractCommand.MoneyIncentivesRules {
 	for _, v := range updateCooperationContractCommand.MoneyIncentivesRules {
+		id, _ := strconv.Atoi(v.MoneyIncentivesRuleId)
 		r := allied_creation_cooperation.MoneyIncentivesRule{
 		r := allied_creation_cooperation.MoneyIncentivesRule{
-			MoneyIncentivesRuleId:     0,
+			MoneyIncentivesRuleId:     id,
 			CooperationContractNumber: v.CooperationContractNumber,
 			CooperationContractNumber: v.CooperationContractNumber,
 			MoneyIncentivesAmount:     v.MoneyIncentivesAmount,
 			MoneyIncentivesAmount:     v.MoneyIncentivesAmount,
 			MoneyIncentivesStage:      v.MoneyIncentivesStage,
 			MoneyIncentivesStage:      v.MoneyIncentivesStage,