commit

rpc/userlib/internal/logic/userdocslogic.go

@@ -49,6 +49,7 @@ func (l *UserDocsLogic) UserDocs(in *userlib.UserDocsRequest) (*userlib.UserDocs
 			DocSourceUserId: value.DocSourceUserId,
 			IsDownload:      int64(value.IsDownload),
 			IsCollection:    int64(value.IsCollection),
+
 		})
 	}
 	if code {

rpc/userlib/userlib.proto

@@ -94,6 +94,8 @@ message userDocs {
     string 	DocSourceUserId=16;//文档原用户id
     int64 	IsDownload=17;//是否转存0未转存1转存
     int64	IsCollection=18;//是否收藏0未收藏1收藏
+    string	IsCollection=18;//是否收藏0未收藏1收藏
+
 }
 service  UserLib {
     rpc UserDocs(UserDocsRequest) returns (UserDocsResponse);//用户文档列表

services/userlib/userDocService.go

@@ -350,9 +350,9 @@ func UserDocsList(in *userlib.UserDocsRequest) ([]*model.UserDoc, int64, bool, s
 			}
 		case int64(1):
 			//收藏的
-			err := docRpcUtil.GetJyDocsDB().Table("user_doc").Where(" userId=? and isCollection=1   and  appId=? ", in.UserId, model.UserDocStatus_Normal, in.AppId).Find(&data)
+			err := docRpcUtil.GetJyDocsDB().Table("user_doc").Where(" userId=? and isCollection=1 and appId=? ", in.UserId, in.AppId).Find(&data)
 			count = int64(len(data))
-			err = docRpcUtil.GetJyDocsDB().Table("user_doc").Where(" userId=? and isCollection=1   and  appId=? order by create_at desc  limit ?,?", in.UserId, model.UserDocStatus_Normal, in.AppId, startIndex, in.PageSize).Find(&data)
+			err = docRpcUtil.GetJyDocsDB().Table("user_doc").Where("userId=? and isCollection=1 and appId=? order by create_at desc  limit ?,?", in.UserId, in.AppId, startIndex, in.PageSize).Find(&data)
 			if err.Error != nil {
 				log.Println("查询收藏记录失败：", err)
 				msg = "查询收藏记录失败"
@@ -369,7 +369,6 @@ func UserDocsList(in *userlib.UserDocsRequest) ([]*model.UserDoc, int64, bool, s
 				return err.Error
 			}
 		}
-
 		return nil
 	})
 	if err != nil {