update

.gitignore

@@ -7,3 +7,4 @@ test.js
 public/avatar
 config/local.json
 .gitlab-ci.yml
+/jb
\ No newline at end of file

controller/resourceController.js

@@ -290,8 +290,8 @@ async function listResourceAll(req, res, next) {
             // console.log(element.resourcesInfos, "==")
             if (element.type == 2) {
                 element.resourcesInfos = utils.buildTree2(element.resourcesInfos, {
-                    keyName: "code",
-                    parentKeyName: 'parentCode',
+                    keyName: "key",
+                    parentKeyName: 'parentKey',
                 });
             }
             obj[element.key] = _.orderBy(element.resourcesInfos || [], 'order', 'asc');

db/model/jt/resourcesInfo.js

@@ -9,14 +9,14 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', {
         primaryKey: true,
         autoIncrement: true
     },
-    code: { 
-        type: DataTypes.STRING,
-        comment: "资源库字段key"
-    },
-    parentCode: { 
-        type: DataTypes.STRING,
-        comment: "资源库key"
-    },
+    // code: { 
+    //     type: DataTypes.STRING,
+    //     comment: "资源库字段key"
+    // },
+    // parentCode: { 
+    //     type: DataTypes.STRING,
+    //     comment: "资源库key"
+    // },
     key: {
         type: DataTypes.STRING,
         comment: "资源库字段key"  
@@ -29,24 +29,24 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', {
         type: DataTypes.STRING,
         comment: "资源库字段value"  
     },
-    parentId: {
-        type: DataTypes.INTEGER,
-        comment: "父级ID"   
-    },
-    parentIds: {
-        type: DataTypes.STRING(500),
-    },
+    // parentId: {
+    //     type: DataTypes.INTEGER,
+    //     comment: "父级ID"   
+    // },
+    // parentIds: {
+    //     type: DataTypes.STRING(500),
+    // },
     order: {
         type: DataTypes.INTEGER,    
         comment: "排序字段",
         defaultValue: 0
     },
-    dictId:  {
-        type: DataTypes.STRING,
-    },
-    fid:  {
-        type: DataTypes.STRING,
-    },
+    // dictId:  {
+    //     type: DataTypes.STRING,
+    // },
+    // fid:  {
+    //     type: DataTypes.STRING,
+    // },
     resourceId: {
         type: DataTypes.INTEGER,
         comment: "所属资源库ID",