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

转到一个项目

作者 陈志颖
提交 ca885a11d2d49ab47e640fdc6e58a95d31a46114 1 个父辈 01a160e7

fix:修复共创合约变更记录组织信息

内嵌 并排对比
正在显示 2 个修改的文件 包含 20 行增加 和 0 行删除
@@ -632,6 +632,7 @@ func (cooperationContractService *CooperationContractService) OperateCooperation @@ -632,6 +632,7 @@ func (cooperationContractService *CooperationContractService) OperateCooperation
632 Undertakers: "", 632 Undertakers: "",
633 CooperationContractNumber: cooperationContractUpdated.CooperationContractNumber, 633 CooperationContractNumber: cooperationContractUpdated.CooperationContractNumber,
634 Company: cooperationContractUpdated.Company, 634 Company: cooperationContractUpdated.Company,
  635 + Org: cooperationContract.Org,
635 Operator: operator, 636 Operator: operator,
636 CreatedAt: time.Now(), 637 CreatedAt: time.Now(),
637 } 638 }
@@ -731,6 +732,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper @@ -731,6 +732,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper
731 Undertakers: "", 732 Undertakers: "",
732 CooperationContractNumber: cooperationContractOperated.CooperationContractNumber, 733 CooperationContractNumber: cooperationContractOperated.CooperationContractNumber,
733 Company: cooperationContractOperated.Company, 734 Company: cooperationContractOperated.Company,
  735 + Org: cooperationContractOperated.Org,
734 Operator: operator, 736 Operator: operator,
735 CreatedAt: time.Now(), 737 CreatedAt: time.Now(),
736 } 738 }
@@ -1266,6 +1268,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -1266,6 +1268,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
1266 Undertakers: undertakerChange, 1268 Undertakers: undertakerChange,
1267 CooperationContractNumber: cooperationContractSaved.CooperationContractNumber, 1269 CooperationContractNumber: cooperationContractSaved.CooperationContractNumber,
1268 Company: company, 1270 Company: company,
  1271 + Org: organization,
1269 Operator: operator, 1272 Operator: operator,
1270 UpdatedAt: time.Time{}, 1273 UpdatedAt: time.Time{},
1271 CreatedAt: time.Now(), 1274 CreatedAt: time.Now(),
@@ -49,6 +49,22 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService) @@ -49,6 +49,22 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
49 company = data 49 company = data
50 } 50 }
51 51
  52 + // 组织机构REST服务初始化
  53 + var organizationService service.OrgService
  54 + if value, err := factory.CreateOrganizationService(map[string]interface{}{}); err != nil {
  55 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  56 + } else {
  57 + organizationService = value
  58 + }
  59 +
  60 + // 获取组织机构信息
  61 + var organization *domain.Org
  62 + if data, err := organizationService.OrgFrom(createCooperationContractChangeLogCommand.CompanyId, createCooperationContractChangeLogCommand.OrgId); err != nil {
  63 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  64 + } else {
  65 + organization = data
  66 + }
  67 +
52 // 用户REST服务初始化 68 // 用户REST服务初始化
53 var userService service.UserService 69 var userService service.UserService
54 if value, err := factory.CreateUserService(map[string]interface{}{}); err != nil { 70 if value, err := factory.CreateUserService(map[string]interface{}{}); err != nil {
@@ -82,6 +98,7 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService) @@ -82,6 +98,7 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
82 Undertakers: createCooperationContractChangeLogCommand.Undertakers, 98 Undertakers: createCooperationContractChangeLogCommand.Undertakers,
83 CooperationContractNumber: createCooperationContractChangeLogCommand.CooperationContractNumber, 99 CooperationContractNumber: createCooperationContractChangeLogCommand.CooperationContractNumber,
84 Company: company, 100 Company: company,
  101 + Org: organization,
85 Operator: operator, 102 Operator: operator,
86 UpdatedAt: time.Time{}, 103 UpdatedAt: time.Time{},
87 DeletedAt: time.Time{}, 104 DeletedAt: time.Time{},