微调

@@ -2,7 +2,7 @@ package protocol
 
 
 //ProviderData 成果提供者
 //ProviderData 成果提供者
 type AchievementProvider struct {
 type AchievementProvider struct {
-	Id             int64   `json:"id"`              //前端需要的唯一id标识，使用user_department表的id
+	UserDepartmentId int64   `json:"user_department_id"` //前端需要的唯一id标识，使用user_department表的id
 	UserCompanyId    int64   `json:"user_company_id"`    //用户的id
 	UserCompanyId    int64   `json:"user_company_id"`    //用户的id
 	UserName         string  `json:"user_name"`
 	UserName         string  `json:"user_name"`
 	DepartmentId     int64   `json:"department_id"` //部门id
 	DepartmentId     int64   `json:"department_id"` //部门id
@@ -79,7 +79,8 @@ type ResponseAchievementInfo struct {
 	DepartmentId      int64                 `json:"department_id"`       //把握人的部门
 	DepartmentId      int64                 `json:"department_id"`       //把握人的部门
 	DeparmentName     string                `json:"department_name"`
 	DeparmentName     string                `json:"department_name"`
 	UserCompanyId     int64                 `json:"user_company_id"` //把握人的id
 	UserCompanyId     int64                 `json:"user_company_id"` //把握人的id
-	UserName          string                `json:"user_name"`
+	NickName          string                `json:"nick_name"`
+	UserDepartmentId  int64                 `json:"user_department_id"` //前端需要的把握人唯一id标识
 	GraspScore        float64               `json:"grasp_score"`        //把握分
 	GraspScore        float64               `json:"grasp_score"`        //把握分
 	UserGraspScore    float64               `json:"user_grasp_score"`   //把握人总得分
 	UserGraspScore    float64               `json:"user_grasp_score"`   //把握人总得分
 	Provider          []AchievementProvider `json:"provider"`           //机会提供者
 	Provider          []AchievementProvider `json:"provider"`           //机会提供者

@@ -294,6 +294,10 @@ func GetAchievementInfo(id int64, companyId int64) *protocol.ResponseAchievement
 		rspData.UserGraspScore = achievementData.UserGraspScore
 		rspData.UserGraspScore = achievementData.UserGraspScore
 		rspData.UserCompanyId = achievementData.UserCompanyId
 		rspData.UserCompanyId = achievementData.UserCompanyId
 		rspData.CrreateAt = achievementData.CreateAt.Format("2006-01-02 15:04:05")
 		rspData.CrreateAt = achievementData.CreateAt.Format("2006-01-02 15:04:05")
+		ud, err := models.GetUserDepartment(rspData.DepartmentId, rspData.UserCompanyId)
+		if err == nil {
+			rspData.UserDepartmentId = ud.Id
+		}
 	} else {
 	} else {
 		log.Error("获取achievement数据失败:%s", err)
 		log.Error("获取achievement数据失败:%s", err)
 	}
 	}
@@ -325,7 +329,7 @@ func GetAchievementInfo(id int64, companyId int64) *protocol.ResponseAchievement
 	usercompanyData, err = models.GetUserCompanyById(rspData.UserCompanyId)
 	usercompanyData, err = models.GetUserCompanyById(rspData.UserCompanyId)
 	if err == nil {
 	if err == nil {
 		rspData.UserCompanyId = usercompanyData.Id
 		rspData.UserCompanyId = usercompanyData.Id
-		rspData.UserName = usercompanyData.NickName
+		rspData.NickName = usercompanyData.NickName
 	}
 	}
 	chaneTypeData, err = models.GetChanceTypeById(int(rspData.ChanceTypeId))
 	chaneTypeData, err = models.GetChanceTypeById(int(rspData.ChanceTypeId))
 	if err == nil {
 	if err == nil {
@@ -358,7 +362,7 @@ func getAchievementProvider(achievementId int64) []protocol.AchievementProvider
 	for i := range sqldata {
 	for i := range sqldata {
 		userDepartment, err := models.GetUserDepartment(sqldata[i].DepartmentId, sqldata[i].UserCompanyId)
 		userDepartment, err := models.GetUserDepartment(sqldata[i].DepartmentId, sqldata[i].UserCompanyId)
 		if err == nil {
 		if err == nil {
-			sqldata[i].Id = userDepartment.Id
+			sqldata[i].UserDepartmentId = userDepartment.Id
 		}
 		}
 	}
 	}
 	return sqldata
 	return sqldata