allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 01a160e71a98ada691048d8c06fe76d300db5beb 1 个父辈 4edd267d

fix:修复共创合约部门信息

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 1 行删除
@@ -287,7 +287,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -287,7 +287,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
287 } 287 }
288 cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeNumber": createCooperationContractCommand.CooperationModeNumber}) 288 cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeNumber": createCooperationContractCommand.CooperationModeNumber})
289 if err != nil { 289 if err != nil {
290 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 290 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
291 } 291 }
292 if cooperationMode == nil { 292 if cooperationMode == nil {
293 return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createCooperationContractCommand.CooperationModeNumber)) 293 return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createCooperationContractCommand.CooperationModeNumber))
@@ -41,6 +41,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -41,6 +41,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
41 "org", 41 "org",
42 "incentives_type", 42 "incentives_type",
43 "company", 43 "company",
  44 + "department",
44 "operator", 45 "operator",
45 "operate_time", 46 "operate_time",
46 "created_at", 47 "created_at",
@@ -74,6 +75,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -74,6 +75,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
74 &cooperationContract.Org, 75 &cooperationContract.Org,
75 &cooperationContract.IncentivesType, 76 &cooperationContract.IncentivesType,
76 &cooperationContract.Company, 77 &cooperationContract.Company,
  78 + &cooperationContract.Department,
77 &cooperationContract.Operator, 79 &cooperationContract.Operator,
78 &cooperationContract.OperateTime, 80 &cooperationContract.OperateTime,
79 &cooperationContract.CreatedAt, 81 &cooperationContract.CreatedAt,
@@ -93,6 +95,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -93,6 +95,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
93 cooperationContract.Org, 95 cooperationContract.Org,
94 cooperationContract.IncentivesType, 96 cooperationContract.IncentivesType,
95 cooperationContract.Company, 97 cooperationContract.Company,
  98 + cooperationContract.Department,
96 cooperationContract.Operator, 99 cooperationContract.Operator,
97 cooperationContract.OperateTime, 100 cooperationContract.OperateTime,
98 cooperationContract.CreatedAt, 101 cooperationContract.CreatedAt,
@@ -226,6 +229,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -226,6 +229,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
226 &cooperationContract.Org, 229 &cooperationContract.Org,
227 &cooperationContract.IncentivesType, 230 &cooperationContract.IncentivesType,
228 &cooperationContract.Company, 231 &cooperationContract.Company,
  232 + &cooperationContract.Department,
229 &cooperationContract.Operator, 233 &cooperationContract.Operator,
230 &cooperationContract.OperateTime, 234 &cooperationContract.OperateTime,
231 &cooperationContract.CreatedAt, 235 &cooperationContract.CreatedAt,
@@ -245,6 +249,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -245,6 +249,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
245 cooperationContract.Org, 249 cooperationContract.Org,
246 cooperationContract.IncentivesType, 250 cooperationContract.IncentivesType,
247 cooperationContract.Company, 251 cooperationContract.Company,
  252 + cooperationContract.Department,
248 cooperationContract.Operator, 253 cooperationContract.Operator,
249 cooperationContract.OperateTime, 254 cooperationContract.OperateTime,
250 cooperationContract.CreatedAt, 255 cooperationContract.CreatedAt,
@@ -670,6 +675,7 @@ func (repository *CooperationContractRepository) UpdateOne(cooperationContract * @@ -670,6 +675,7 @@ func (repository *CooperationContractRepository) UpdateOne(cooperationContract *
670 Status: cooperationContract.Status, 675 Status: cooperationContract.Status,
671 Org: cooperationContract.Org, 676 Org: cooperationContract.Org,
672 Company: cooperationContract.Company, 677 Company: cooperationContract.Company,
  678 + Department: cooperationContract.Department,
673 Operator: cooperationContract.Operator, 679 Operator: cooperationContract.Operator,
674 OperateTime: cooperationContract.OperateTime, 680 OperateTime: cooperationContract.OperateTime,
675 CreatedAt: cooperationContract.CreatedAt, 681 CreatedAt: cooperationContract.CreatedAt,
@@ -698,6 +704,7 @@ func (repository *CooperationContractRepository) UpdateMany(cooperationContracts @@ -698,6 +704,7 @@ func (repository *CooperationContractRepository) UpdateMany(cooperationContracts
698 Status: cooperationContract.Status, 704 Status: cooperationContract.Status,
699 Org: cooperationContract.Org, 705 Org: cooperationContract.Org,
700 Company: cooperationContract.Company, 706 Company: cooperationContract.Company,
  707 + Department: cooperationContract.Department,
701 Operator: cooperationContract.Operator, 708 Operator: cooperationContract.Operator,
702 OperateTime: cooperationContract.OperateTime, 709 OperateTime: cooperationContract.OperateTime,
703 CreatedAt: cooperationContract.CreatedAt, 710 CreatedAt: cooperationContract.CreatedAt,