列表修改

yangfu
protocol/chance.go
services/chance/chance.go
services/message/message.go
--- a/protocol/chance.go
查看文件 @707ded1
+++ b/protocol/chance.go
查看文件 @707ded1
@@ -181,7 +181,7 @@ type MyApproveChanceResponse struct {
 //我的审核机会列表
 type ChanceApproveItemOrm struct {
-	ChanceUserId       int64  `orm:"column(chance_user_id)"`
+	ChanceUserId       int64  `orm:"column(user_id)"`
 	SourceContent      string `orm:"column(source_content)"`
 	ChanceEnableStatus int    `orm:"column(enable_status)"`
 	Images             string `orm:"column(images)"`
@@ -251,7 +251,7 @@ type ChancePoolItemOrm struct {
 //机会池收藏列表项
 type ChanceCollectItemOrm struct {
 	ChanceId           int64     `orm:"column(id)"`
-	Uid                int64     `orm:"column(user_id)"`
+	ChanceUserId       int64     `orm:"column(user_id)"`
 	CreateTime         time.Time `orm:"column(create_at)"`
 	SourceContent      string    `orm:"column(source_content)"`
 	ChanceEnableStatus int       `orm:"column(enable_status)"`
@@ -275,7 +275,7 @@ type ChanceCollectItemOrm struct {
 //机会池收藏列表项
 type ChanceThumbUpItemOrm struct {
 	ChanceId           int64     `orm:"column(id)"`
-	Uid                int64     `orm:"column(user_id)"`
+	ChanceUserId       int64     `orm:"column(user_id)"`
 	CreateTime         time.Time `orm:"column(create_at)"`
 	SourceContent      string    `orm:"column(source_content)"`
 	ChanceEnableStatus int       `orm:"column(enable_status)"`
--- a/services/chance/chance.go
查看文件 @707ded1
+++ b/services/chance/chance.go
查看文件 @707ded1
@@ -936,9 +936,10 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove
 		} else if chance.ChanceEnableStatus == 0 { //机会关闭
 			commItem.ChanceStatus = protocol.ChanceStatusClose
 		} else {
-			if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+			if provider, err = agg.GetUserBaseInfo(chance.ChanceUserId, header.CompanyId); err != nil {
 				commItem.ChanceStatus = protocol.ChanceStatusDelete
-				log.Error(err)
+				log.Error(chance.ChanceUserId, header.CompanyId, err)
+				err = nil
 				//return
 			} else {
 				item := protocol.ChanceItem{
@@ -1005,7 +1006,7 @@ func MyCollectChance(header *protocol.RequestHeader, request *protocol.MyCollect
 		} else if chance.ChanceEnableStatus == 0 { //机会关闭
 			commItem.ChanceStatus = protocol.ChanceStatusClose
 		} else {
-			if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+			if provider, err = agg.GetUserBaseInfo(chance.ChanceUserId, header.CompanyId); err != nil {
 				commItem.ChanceStatus = protocol.ChanceStatusDelete
 				log.Error(err)
 				//return
@@ -1075,7 +1076,7 @@ func MyThumbUpChance(header *protocol.RequestHeader, request *protocol.MyThumbUp
 		} else if chance.ChanceEnableStatus == 0 { //机会关闭
 			commItem.ChanceStatus = protocol.ChanceStatusClose
 		} else {
-			if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+			if provider, err = agg.GetUserBaseInfo(chance.ChanceUserId, header.CompanyId); err != nil {
 				commItem.ChanceStatus = protocol.ChanceStatusDelete
 				log.Error(err)
 				//return
@@ -1146,7 +1147,7 @@ func MyComment(header *protocol.RequestHeader, request *protocol.MyCommentReques
 			} else if chance.ChanceEnableStatus == 0 { //机会关闭
 				commItem.ChanceStatus = protocol.ChanceStatusClose
 			} else {
-				if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+				if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {
 					commItem.ChanceStatus = protocol.ChanceStatusDelete
 					log.Error(err)
 					//return
--- a/services/message/message.go
查看文件 @707ded1
+++ b/services/message/message.go
查看文件 @707ded1
@@ -337,7 +337,7 @@ func MsgChanceComment(header *protocol.RequestHeader, request *protocol.MsgChanc
 			} else if chance.ChanceEnableStatus == 0 { //机会关闭
 				commItem.ChanceStatus = protocol.ChanceStatusClose
 			} else {
-				if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+				if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {
 					commItem.ChanceStatus = protocol.ChanceStatusDelete
 					log.Error(err)
 					//return
@@ -401,7 +401,7 @@ func MsgChanceThumbUp(header *protocol.RequestHeader, request *protocol.MsgChanc
 			} else if chance.ChanceEnableStatus == 0 { //机会关闭
 				commItem.ChanceStatus = protocol.ChanceStatusClose
 			} else {
-				if provider, err = agg.GetUserBaseInfo(header.UserId, header.CompanyId); err != nil {
+				if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {
 					commItem.ChanceStatus = protocol.ChanceStatusDelete
 					log.Error(err)
 					//return