diff --git a/apps/device/services/device.go b/apps/device/services/device.go index fe1ad44..6fc75fb 100644 --- a/apps/device/services/device.go +++ b/apps/device/services/device.go @@ -85,9 +85,6 @@ func (m *deviceModelImpl) FindListPage(page, pageSize int, data entity.Device) ( if data.Name != "" { db = db.Where("name like ?", "%"+data.Name+"%") } - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.Status != "" { db = db.Where("status = ?", data.Status) } @@ -122,9 +119,6 @@ func (m *deviceModelImpl) FindList(data entity.Device) *[]entity.DeviceRes { if data.Name != "" { db = db.Where("name like ?", "%"+data.Name+"%") } - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.DeviceType != "" { db = db.Where("device_type = ?", data.DeviceType) } diff --git a/apps/device/services/product.go b/apps/device/services/product.go index 95c6aed..9689291 100644 --- a/apps/device/services/product.go +++ b/apps/device/services/product.go @@ -65,9 +65,6 @@ func (m *productModelImpl) FindListPage(page, pageSize int, data entity.Product) if data.ProductCategoryId != "" { db = db.Where("product_category_id = ?", data.ProductCategoryId) } - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.ProtocolName != "" { db = db.Where("protocol_name like ?", "%"+data.ProtocolName+"%") } @@ -96,9 +93,6 @@ func (m *productModelImpl) FindList(data entity.Product) *[]entity.ProductRes { if data.ProductCategoryId != "" { db = db.Where("product_category_id = ?", data.ProductCategoryId) } - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.ProtocolName != "" { db = db.Where("protocol_name like ?", "%"+data.ProtocolName+"%") } diff --git a/apps/rule/services/rulechain.go b/apps/rule/services/rulechain.go index f551b00..bf16418 100644 --- a/apps/rule/services/rulechain.go +++ b/apps/rule/services/rulechain.go @@ -70,9 +70,6 @@ func (m *ruleChainModelImpl) FindListPage(page, pageSize int, data entity.RuleCh offset := pageSize * (page - 1) db := global.Db.Table(m.table) // 此处填写 where参数判断 - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.RuleName != "" { db = db.Where("rule_name like ?", "%"+data.RuleName+"%") } @@ -91,9 +88,6 @@ func (m *ruleChainModelImpl) FindList(data entity.RuleChain) *[]entity.RuleChain list := make([]entity.RuleChain, 0) db := global.Db.Table(m.table) // 此处填写 where参数判断 - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.RuleName != "" { db = db.Where("rule_name like ?", "%"+data.RuleName+"%") } @@ -110,9 +104,6 @@ func (m *ruleChainModelImpl) FindListBaseLabel(data entity.RuleChain) *[]entity. list := make([]entity.RuleChainBaseLabel, 0) db := global.Db.Table(m.table) // 此处填写 where参数判断 - if data.Owner != "" { - db = db.Where("owner = ?", data.Owner) - } if data.RuleName != "" { db = db.Where("rule_name like ?", "%"+data.RuleName+"%") }