明树Git Lab

Commit ca8fea7d authored by zfp1's avatar zfp1

update

parent eedc4e1a
Pipeline #104356 passed with stage
in 2 seconds
...@@ -237,7 +237,7 @@ async function listResourceAll(req, res, next) { ...@@ -237,7 +237,7 @@ async function listResourceAll(req, res, next) {
for (let index = 0; index < datas.length; index++) { for (let index = 0; index < datas.length; index++) {
const element = datas[index]; const element = datas[index];
if (element.type == 2) { if (element.type == 2) {
element.resourcesInfos = utils.buildTree(element.resourcesInfos); element.resourcesInfos = utils.buildTree2(element.resourcesInfos, 'code', 'parentCode');
} }
obj[element.key] = element.resourcesInfos || []; obj[element.key] = element.resourcesInfos || [];
} }
......
...@@ -150,8 +150,8 @@ User.hasMany(Project, { foreignKey: 'projectCreator', as: 'createdProjects' }); ...@@ -150,8 +150,8 @@ User.hasMany(Project, { foreignKey: 'projectCreator', as: 'createdProjects' });
Project.belongsTo(User, { foreignKey: 'projectCreator', as: 'creator' }); Project.belongsTo(User, { foreignKey: 'projectCreator', as: 'creator' });
/**项目-资源信息 1:n */ /**项目-资源信息 1:n */
// Resources.hasMany(ResourcesInfo, { foreignKey: 'resourceId', as: 'resourcesInfos' }); Resources.hasMany(ResourcesInfo, { foreignKey: 'resourceId', as: 'resourcesInfos' });
// ResourcesInfo.belongsTo(Resources, { foreignKey: 'resourceId' }); ResourcesInfo.belongsTo(Resources, { foreignKey: 'resourceId' });
/**项目-核心边界条件 1:n */ /**项目-核心边界条件 1:n */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment