浏览代码

Merge branch 'one' of http://git.cc-lotus.info/pointToNetwork/server into one

lrf 1 年之前
父节点
当前提交
7e819ed626
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 1 0
      app/controller/system/config/.goodsTags.js
  2. 3 2
      app/service/system/goodsTags.js

+ 1 - 0
app/controller/system/config/.goodsTags.js

@@ -44,6 +44,7 @@ module.exports = {
     parameters: {
       query: {
         pid: 'pid',
+        shop: 'shop',
       },
     },
   },

+ 3 - 2
app/service/system/goodsTags.js

@@ -21,10 +21,11 @@ class GoodsTagsService extends CrudService {
    * 树形图结构
    * @param {Object} query 查询条件
    * @param query.pid 一级id
+   * @param query.shop 店铺id
    * @return {Array} 树形图结构数据
    */
-  async tree({ pid }) {
-    let list = await this.model.find({ status: '0' });
+  async tree({ pid, shop }) {
+    let list = await this.model.find({ shop, status: '0' });
     list = JSON.parse(JSON.stringify(list));
     list = list.map(i => _.omit(i, [ 'meta', '__v' ]));
     const level1 = list.filter(f => (pid ? f.id === pid : !f.pid));