Merge branch 'feat-hjj-ReportsManage' into dev

internel/logic/members.go

@@ -4,10 +4,8 @@ import (
 	"errors"
 	"micro-document/api/members"
 	"micro-document/internel/dao"
-	util "micro-document/pkg/utils"
 
 	"github.com/google/uuid"
-	"github.com/jinzhu/copier"
 )
 
 type membersLogic struct{}
@@ -62,8 +60,17 @@ func (membersLogic) GetMemberList(req *members.GetMemberListReq) (result *member
 	//查询获取成员管理，董事会，委员会信息
 	result.Total = int32(total)
 
-	if err = copier.CopyWithOption(&result.Data, &data, util.CopierProtoOptions); err != nil {
-		return nil, errors.New("复制成员列表失败")
+	result.Data = make([]*members.Member, len(data))
+	for i, member := range data {
+		result.Data[i] = &members.Member{
+			Uuid:         member.Uuid,
+			Name:         member.Name,
+			Brief:        member.Brief,
+			Introduction: member.Introduction,
+			Sort:         member.Sort,
+			UpdatedAt:    member.UpdatedAt.Format("2006-01-02 15:04:05"),
+			Operator:     member.Operator,
+		}
 	}
 	for _, v := range result.Data {
 		management, err := dao.MembersDao.GetManagementByUuid(v.Uuid)