合并分支 'dev' 到 'test'

fix:共创项目返回的承接人



查看合并请求 !53

@@ -367,7 +367,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
 					})
 					})
 					userType := cooperationApplication.CooperationApplicationApplicant.UserType & 1
 					userType := cooperationApplication.CooperationApplicationApplicant.UserType & 1
 					fmt.Printf("用户类型值： %d\n", userType)
 					fmt.Printf("用户类型值： %d\n", userType)
-					if userType == 1 && cooperationApplication.CooperationApplicationStatus == 2 { // 申请人中的员工类型，审核中通过的
+					if (userType == 1 || cooperationApplication.CooperationApplicationApplicant.UserType == 2) && cooperationApplication.CooperationApplicationStatus == 2 { // 申请人中的员工类型，审核中通过的
 						applicants = append(applicants, cooperationApplication.CooperationApplicationApplicant)
 						applicants = append(applicants, cooperationApplication.CooperationApplicationApplicant)
 					}
 					}
 				}
 				}