|
@@ -359,7 +359,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec |
|
@@ -359,7 +359,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec |
359
|
undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3)
|
359
|
undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3)
|
360
|
}
|
360
|
}
|
361
|
|
361
|
|
362
|
- // TODO 判断项目关联的合约承接人类型
|
362
|
+ // 判断项目关联的合约承接人类型
|
363
|
undertakers := make([]*domain.Undertaker, 0)
|
363
|
undertakers := make([]*domain.Undertaker, 0)
|
364
|
if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
|
364
|
if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
|
365
|
"offsetLimit": false,
|
365
|
"offsetLimit": false,
|
|
@@ -390,6 +390,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec |
|
@@ -390,6 +390,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec |
390
|
undertakerUserTypes = append(undertakerUserTypes, int32(3))
|
390
|
undertakerUserTypes = append(undertakerUserTypes, int32(3))
|
391
|
}
|
391
|
}
|
392
|
|
392
|
|
|
|
393
|
+ // 取项目承接人和合约承接人的交集
|
393
|
newUndertakerTypesUncheckedAvailable := utils.Intersect32(undertakerTypesUncheckedAvailable, undertakerUserTypes)
|
394
|
newUndertakerTypesUncheckedAvailable := utils.Intersect32(undertakerTypesUncheckedAvailable, undertakerUserTypes)
|
394
|
|
395
|
|
395
|
log.Logger.Info("承接人类型", map[string]interface{}{
|
396
|
log.Logger.Info("承接人类型", map[string]interface{}{
|