update

a.js

-function flattenTreeIterative(forest) {
+function flattenTree(forest) {
   const result = [];
-  const stack = [...forest.map(node  => ({ node, parentId: null }))];
   
-  while (stack.length)  {
-    const { node, parentId } = stack.pop(); 
-    const { chilrden, children, ...rest } = node;
+  /**
+   * 递归处理节点
+   * @param {Object} node - 当前节点
+   * @param {string|null} parentId - 父节点ID
+   */
+  function traverse(node, parentId) {
+    // 创建节点副本避免修改原数据
+    const nodeCopy = { ...node };
     
-    result.push({  ...rest, parentId });
+    // 添加parentId属性
+    nodeCopy.parentId  = parentId;
     
-    const kids = chilrden || children || [];
-    for (let i = kids.length  - 1; i >= 0; i--) {
-      stack.push({  node: kids[i], parentId: node.id  });
+    // 移除children属性（使用正确拼写）
+    delete nodeCopy.children; 
+    
+    // 添加当前节点到结果集
+    result.push(nodeCopy); 
+    
+    // 处理子节点（兼容chilrden拼写错误）
+    const children = node.chilrden  || node.children  || [];
+    for (const child of children) {
+      traverse(child, node.id); 
     }
   }
-  
+ 
+  // 遍历森林中的每棵树
+  for (const tree of forest) {
+    traverse(tree, null); // 根节点parentId为null 
+  }
+ 
   return result;
 }
 
@@ -33,8 +50,8 @@ const complexForest = [
     children: [{ id: 'B1' }]
   }
 ];
- 
-console.log(flattenTreeIterative(complexForest)); 
+
+console.log(flattenTree(complexForest));
 /* 输出：
 [
   { id: 'A', name: 'Root A', parentId: null },

controller/resourceController.js

@@ -13,14 +13,26 @@ async function createResource(req, res, next) {
         ret = ret.toJSON();
         console.log(ret);
         if (body.resourceInfos && body.resourceInfos.length && ret.id) {
-            let ris = [];
-            for (let index = 0; index < body.resourceInfos.length; index++) {
-                const element = body.resourceInfos[index];
-                element.resourceId = ret.id;
-                ris.push(element);
+            if(type == 1){
+                let ris = [];
+                for (let index = 0; index < body.resourceInfos.length; index++) {
+                    const element = body.resourceInfos[index];
+                    element.resourceId = ret.id;
+                    ris.push(element);
+                }
+                console.log(ris, "===")
+                await DB.ResourcesInfo.bulkCreate(ris);
+            } else if(type == 2) { 
+                //树结构
+                let ris = [];
+                let data = utils.flattenTreeIterative(body.resourceInfos);
+                for (let index = 0; index < data.length; index++) {
+                    const element = data[index];
+                    element.resourceId = ret.id;
+                    ris.push(element);
+                }
+                await DB.ResourcesInfo.bulkCreate(ris);
             }
-            console.log(ris, "===")
-            await DB.ResourcesInfo.bulkCreate(ris);
         }
         return res.sendData(ret);
     } catch (error) {

controller/userController.js

@@ -255,6 +255,8 @@ async function listUser(req, res, next) {
             through: { attributes: [] },
           }
         ];
+        search.distinct = true,           // ✅ 关键：去重
+        search.col = 'id'   
         search.attributes = req.body.attributes || { exclude: ['password', 'salt'] };
         let ret = await DB.User.findAndCountAll(search);
         return res.sendData(ret);

db/model/jt/resources.js

@@ -13,6 +13,10 @@ const Resources = sequelize.define('Resources', {
         type: DataTypes.STRING,
         comment: "资源库key"
     },
+    parentkey: { 
+        type: DataTypes.STRING,
+        comment: "资源库key"
+    },
     name: {
         type: DataTypes.STRING,
         comment: "资源库名称"

utils/index.js

@@ -86,19 +86,12 @@ function flattenTreeIterative(forest) {
   return result;
 }
 
-function genTracSourceCode({EnterpriseCode, type, date, batchNum, logisticsNum}) {
-    // 企业代码（9） MA4W271Y8 + 产品代码【种植、初加工、深加工】（6）+ 生产/出厂日期（8）） + 批次号（8）+ 物流码 + 校验码（8）
-    //MA4W271Y8
-    date = date && moment().format('YYYYMMDD');
-    return `${EnterpriseCode}${type}${date}${batchNum}${logisticsNum}`;
-
-}
-
 
 module.exports = {
     saltHashPassword,
     checkUserPassword,
     buildTree,
     disTree,
+    flattenTreeIterative
 
 }
\ No newline at end of file