Merge remote-tracking branch 'origin/dev' into test

@@ -738,7 +738,6 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 			}
 			}
 			break
 			break
 		case protocol.AuditByRole:
 		case protocol.AuditByRole:
-			//roleName="" //TODO：角色
 			if e := json.Unmarshal([]byte(config.ToRole), &roleId); e == nil {
 			if e := json.Unmarshal([]byte(config.ToRole), &roleId); e == nil {
 				if userIds, err = getRoleUsers(header, roleId[0]); err != nil {
 				if userIds, err = getRoleUsers(header, roleId[0]); err != nil {
 					log.Error(err)
 					log.Error(err)
@@ -968,14 +967,13 @@ func ChancePool(header *protocol.RequestHeader, request *protocol.ChancePoolRequ
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}
-	if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
-		log.Error(err)
-		return
-	}
 	rsp = &protocol.ChancePoolResponse{Total: total}
 	rsp = &protocol.ChancePoolResponse{Total: total}
-
 	for i := 0; i < len(myChances); i++ {
 	for i := 0; i < len(myChances); i++ {
 		chance := myChances[i]
 		chance := myChances[i]
+		if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {
+			log.Error(err)
+			return
+		}
 		commItem := protocol.CommonListItem{}
 		commItem := protocol.CommonListItem{}
 		{
 		{
 			item := protocol.ChanceItem{
 			item := protocol.ChanceItem{

@@ -63,7 +63,7 @@ func IComment(header *protocol.RequestHeader, request *protocol.ICommentRequest)
 		orm.Rollback()
 		orm.Rollback()
 		return
 		return
 	}
 	}
-	if baseUserInfo, err = agg.GetUserBaseInfo(header.Uid, header.CompanyId); err != nil {
+	if baseUserInfo, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}