规则链查询添加vendor条件

services/knowoapi/controllers/rule_chain.go

@@ -13,7 +13,7 @@ type RuleChainController struct {
 	Token   Token
 }
 
-// Post ``
+// Post “
 // POST /admin/rule_chain
 func (a *RuleChainController) Post() {
 	ptl := new(models.RuleChain)
@@ -74,7 +74,8 @@ func (a *RuleChainController) Get() {
 		return
 	}
 	name := a.Ctx.URLParam("name")
-	datas, total, err := a.Service.Query(pi, ps, name)
+	vendorId := a.Token.getVendorID(a.Ctx)
+	datas, total, err := a.Service.Query(pi, ps, name, vendorId)
 	if err != nil {
 		responseError(a.Ctx, ErrDatabase, err.Error())
 		return

services/knowoapi/model/rule_chain.go

@@ -19,11 +19,14 @@ func (a *RuleChain) Init(db *gorm.DB) *RuleChain {
 }
 
 // Query query all roles
-func (a *RuleChain) Query(pi, ps int, name string, root bool) (datas []models.RuleChain, total int, err error) {
+func (a *RuleChain) Query(pi, ps int, name, vendorId string, root bool) (datas []models.RuleChain, total int, err error) {
 	tx := a.db.Where("1=1")
 	if name != "" {
 		tx = tx.Where("name like ?", "%"+name+"%")
 	}
+	if vendorId != "" {
+		tx = tx.Where("vendor_id = ?", vendorId)
+	}
 	if root {
 		tx = tx.Where("root = 1")
 	}

services/knowoapi/services/rule_chain.go

@@ -14,7 +14,7 @@ type RuleChainService interface {
 	Create(*models.RuleChain) error
 	Delete(*models.RuleChain) error
 	Update(*models.RuleChainParams) error
-	Query(int, int, string) ([]models.RuleChain, int, error)
+	Query(int, int, string, string) ([]models.RuleChain, int, error)
 	Get(vendorId, recordId string) (models.RuleChain, error)
 	UpdateChainRoot(*models.ChangeRootParams) error
 }
@@ -29,8 +29,8 @@ func NewRuleChainService(model *model.All) RuleChainService {
 	}
 }
 
-func (a ruleChainService) Query(pi, ps int, name string) ([]models.RuleChain, int, error) {
-	return a.model.RuleChain.Query(pi, ps, name, false)
+func (a ruleChainService) Query(pi, ps int, name, vendorId string) ([]models.RuleChain, int, error) {
+	return a.model.RuleChain.Query(pi, ps, name, vendorId, false)
 }
 
 func (a ruleChainService) Get(vendorId, recordId string) (models.RuleChain, error) {
@@ -40,7 +40,7 @@ func (a ruleChainService) Get(vendorId, recordId string) (models.RuleChain, erro
 func (a ruleChainService) Create(ruleChain *models.RuleChain) error {
 	ruleChain.RecordId = guid.S()
 	if ruleChain.Root {
-		result, total, err := a.model.RuleChain.Query(1, 1, "", true)
+		result, total, err := a.model.RuleChain.Query(1, 1, "", ruleChain.VendorID, true)
 		if err != nil {
 			return err
 		}
@@ -262,7 +262,7 @@ func (a ruleChainService) UpdateChainRoot(params *models.ChangeRootParams) error
 		return err
 	}
 	if params.Root {
-		data, total, err := a.model.RuleChain.Query(1, 1, "", true)
+		data, total, err := a.model.RuleChain.Query(1, 1, "", params.VendorId, true)
 		if err != nil {
 			return err
 		}