修复通过IP查询IP名单时没有过滤已删除IP的Bug

This commit is contained in:
GoEdgeLab
2021-12-02 17:12:13 +08:00
parent 349d85ece8
commit 6aedd56976

View File

@@ -322,6 +322,7 @@ func (this *IPItemDAO) FindEnabledItemContainsIP(tx *dbs.Tx, listId int64, ip ui
// FindEnabledItemsWithIP 根据IP查找Item // FindEnabledItemsWithIP 根据IP查找Item
func (this *IPItemDAO) FindEnabledItemsWithIP(tx *dbs.Tx, ip string) (result []*IPItem, err error) { func (this *IPItemDAO) FindEnabledItemsWithIP(tx *dbs.Tx, ip string) (result []*IPItem, err error) {
_, err = this.Query(tx). _, err = this.Query(tx).
State(IPItemStateEnabled).
Attr("ipFrom", ip). Attr("ipFrom", ip).
Attr("ipTo", ""). Attr("ipTo", "").
Where("(expiredAt=0 OR expiredAt>:nowTime)"). Where("(expiredAt=0 OR expiredAt>:nowTime)").