feature: 添加会议室预约查询参数

handler/reservation.go

@@ -22,13 +22,18 @@ func (r *Reservation) List(ctx context.Context, req *model.ListReq, rsp *comm_de
 		return err
 	}
 	g.Log().Info("Received Reservation.List request @ " + tenant)
+	// 获取用户信息
+	userInfo, err := micro_srv.GetUserInfo(ctx)
+	if err != nil {
+		return err
+	}
 	if req.Size == 0 {
 		req.Size = DefaultPageNum
 	}
 	if req.Current < 0 {
 		req.Current = DefaultPageCurrent
 	}
-	list, total, err := reservation.NewSrv(tenant).List(*req)
+	list, total, err := reservation.NewSrv(tenant).List(*req, userInfo)
 	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err

model/meeting/meeting_reservation.go

@@ -29,6 +29,7 @@ type ReservationReq struct {
 	UserName           string      `orm:"UserName"           json:"user_name"`                           // 预约人姓名
 	Status             int         `orm:"Status"             json:"status"`                              // 预约状态(1:预定   2:取消)
 	TimeSplit          []string    `json:"time_split"`                                                   // 预约时间
+	Mine               bool         `json:"mine"`
 }
 
 type List struct {

service/reservation/reservation.go

@@ -37,7 +37,7 @@ func NewSrv(tenant string) Service {
 }
 
 // List 预约列表
-func (s Service) List(req model.ListReq) ([]meeting3.List, int, error) {
+func (s Service) List(req model.ListReq, userInfo request.UserInfo) ([]meeting3.List, int, error) {
 	entityModel := s.Dao.M
 
 	if req.Entity != nil {
@@ -53,6 +53,9 @@ func (s Service) List(req model.ListReq) ([]meeting3.List, int, error) {
 		if entity.UserName != "" {
 			entityModel = entityModel.WhereLike(tableSql+s.Dao.Columns.UserName, "%"+entity.UserName+"%")
 		}
+		if entity.Mine {
+			entityModel = entityModel.Where(tableSql+s.Dao.Columns.UserId, userInfo.Id)
+		}
 		// 预约状态(1:预定   2:取消)
 		if entity.Status != 0 {
 			entityModel = entityModel.Where(tableSql+s.Dao.Columns.Status, entity.Status)