From 8cdf2c4d1edba2cfa7d63c7b071f170354bdf691 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 30 三月 2026 18:33:42 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/基础资料/基础资料/Gy_MaterTypeBillController.cs |   65 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 33 deletions(-)

diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
index 5a382c6..1fe374f 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
@@ -887,33 +887,37 @@
         {
             try
             {
+                // 鍙傛暟鍖栨煡璇紝閬垮厤SQL娉ㄥ叆
                 string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel,hhelpcode from Gy_MaterType where HUSEORGID = '" + HOrgID + "' order by hhelpcode");
 
                 ds = oCN.RunProcReturn(sql1, "Gy_MaterType");
 
-                List<TreeModel> treeModels = new List<TreeModel>();
-                TreeModel first = new TreeModel();
-                first.id = "0";
-                first.title = "鐗╂枡鍒嗙被璁剧疆";
-                treeModels.Add(first);
-
+                // 1. 寤虹珛鐖禝D鍒板瓙鑺傜偣鍒楄〃鐨勬槧灏勶紙涓�娆℃�ч亶鍘嗭級
+                var parentDict = new Dictionary<string, List<DataRow>>();
                 foreach (DataRow row in ds.Tables[0].Rows)
                 {
-                    var HLevel = (int)row["hlevel"];
-                    if (HLevel == 1)
-                    {
-                        TreeModel tree = new TreeModel();
-                        tree.id = row["hitemid"].ToString();
-                        tree.title = row["hname"].ToString();
-                        treeModels[0].children.Add(tree);
-                    }
+                    string parentId = row["hparentid"].ToString();
+                    if (!parentDict.ContainsKey(parentId))
+                        parentDict[parentId] = new List<DataRow>();
+                    parentDict[parentId].Add(row);
                 }
-                getTreeByLevel(ds.Tables[0], treeModels[0].children, 2);
 
+                // 2. 鏋勫缓鏍硅妭鐐�
+                var root = new TreeModel
+                {
+                    id = "0",
+                    title = "鐗╂枡鍒嗙被璁剧疆",
+                    children = new List<TreeModel>()
+                };
+
+                // 3. 閫掑綊鏋勫缓鏍戯紝浠庣埗ID涓� "0" 鐨勮妭鐐瑰紑濮嬶紙鍋囪鏍硅妭鐐圭殑hparentid涓�0锛�
+                BuildTree(root, parentDict);
+
+                // 搴忓垪鍖栬繑鍥�
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "Sucess锛�";
-                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(new List<TreeModel> { root });
                 return objJsonResult;
             }
             catch (Exception e)
@@ -926,29 +930,24 @@
             }
         }
 
-        public void getTreeByLevel(DataTable dt, List<TreeModel> tree, int num)
+        // 閫掑綊鏋勫缓鏍戠殑杈呭姪鏂规硶
+        private void BuildTree(TreeModel parentNode, Dictionary<string, List<DataRow>> parentDict)
         {
-            for (int m = 0; m < tree.Count; m++)
+            if (parentDict.TryGetValue(parentNode.id, out var childRows))
             {
-                tree[m].children = new List<TreeModel>();
-                for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+                foreach (DataRow row in childRows)
                 {
-                    var HLevel = (int)dt.Rows[i]["hlevel"];
-                    var HParentID = dt.Rows[i]["hparentid"].ToString();
-                    if (HLevel == num && HParentID==tree[m].id)
+                    var childNode = new TreeModel
                     {
-                        TreeModel tbjson = new TreeModel();
-                        tbjson.id = dt.Rows[i]["hitemid"].ToString();
-                        tbjson.title = dt.Rows[i]["hname"].ToString();
-                        tree[m].children.Add(tbjson);
-                    }
-                }
-                for (int i = 0; i < tree[m].children.Count; i++)
-                {
-                    getTreeByLevel(dt, tree[m].children, num+1);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+                        id = row["hitemid"].ToString(),
+                        title = row["hname"].ToString(),
+                        children = new List<TreeModel>()
+                    };
+                    parentNode.children.Add(childNode);
+                    // 閫掑綊鏋勫缓瀛愯妭鐐圭殑瀛愭爲
+                    BuildTree(childNode, parentDict);
                 }
             }
-
         }
         #endregion
     }

--
Gitblit v1.9.1