From 837900462ac50ca9c80f43329fc49f566c0a911d Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Tue, 21 Oct 2025 14:29:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BF=87=E6=9C=9F=E5=8F=B7=E7=A0=81?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/dto/sms_phone.go |  4 +++-
 app/admin/service/sms_phone.go     | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/admin/service/dto/sms_phone.go b/app/admin/service/dto/sms_phone.go
index f03383a..36345bb 100644
--- a/app/admin/service/dto/sms_phone.go
+++ b/app/admin/service/dto/sms_phone.go
@@ -14,8 +14,10 @@ type SmsPhoneGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Service        string `form:"service"  search:"type:exact;column:service;table:sms_phone" comment:"sms 服务"`
 	PlatformCode   string `form:"platformCode"  search:"type:exact;column:platform_code;table:sms_phone" comment:"平台code"`
-	ServiceCode    string `form:"serviceCode"  search:"type:exact;column:service_code;table:sms_phone" comment:"服务code"`
+	ServiceCode    string `form:"serviceCode"  search:"type:contains;column:service_code;table:sms_phone" comment:"服务code"`
+	Phone          string `form:"phone" search:"type:contains;column:phone;table:sms_phone" comment:"号码"`
 	Type           int    `form:"type"  search:"-" comment:"类型 0-短效 1-长效"`
+	IsActived      int    `form:"isActived" search:"-" comment:"是否可用"`
 	SmsPhoneOrder
 }
 
diff --git a/app/admin/service/sms_phone.go b/app/admin/service/sms_phone.go
index 1a1c592..e0cac44 100644
--- a/app/admin/service/sms_phone.go
+++ b/app/admin/service/sms_phone.go
@@ -725,12 +725,20 @@ func (e *SmsPhone) GetPage(c *dto.SmsPhoneGetPageReq, p *actions.DataPermission,
 	var err error
 	var data models.SmsPhone
 
-	err = e.Orm.Model(&data).
+	query := e.Orm.Model(&data).
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
-		).
+		)
+
+	switch c.IsActived {
+	case 1:
+		query = query.Where("expire_time > ?", time.Now())
+	case 2:
+		query = query.Where("expire_time < ?", time.Now())
+	}
+	err = query.
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {