From dcdb60f04fecd4252d03e843098d0e89a2e46796 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 10 五月 2021 09:26:44 +0800
Subject: [PATCH] 部门设置树形结构

---
 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs |   80 -------------------
 WebAPI/Properties/PublishProfiles/API.pubxml.user     |  130 ++++++++++++++++----------------
 2 files changed, 67 insertions(+), 143 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 224833f..465de7c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -512,27 +512,8 @@
         public object LoadTree_Json(string sWhere)
         {
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
-            string sSql = "";
-            // sSql = "select Name title,code id from province where code=330000 ";
-            //sSql = "Select HItemID id,HName title,HParentID HParentID,1 HLevel,'true' lazy from Gy_Department";
-            //List<Tree_Model> GetRegionList = GetRegion(sSql);
-            //if (GetRegionList == null)
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏄剧ず澶辫触锛佸師鍥狅細" + DBUtility.ClsPub.sExeReturnInfo;
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
-            //else
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 1;
-            //    objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
-            //    objJsonResult.data = GetRegionList;
-            //    return objJsonResult;
-            //}
-            ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+            //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+            ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
@@ -551,64 +532,7 @@
             }
         }
 
-        public List<Tree_Model> GetRegion(string sSql)
-        {
-            try
-            {
-                SqlDataReader reader = GetReader(sSql);
-                List<Tree_Model> ModuleList = new List<Tree_Model>();
-                while (reader.Read())
-                {
-                    ModuleList.Add(new Tree_Model()
-                    {
-                        id = Convert.ToInt32(reader["id"]),
-                        HParentID = Convert.ToInt32(reader["HParentID"]),
-                        HLevel = Convert.ToInt32(reader["HLevel"]),
-                        lazy = Convert.ToBoolean(reader["lazy"]),
-                        title = reader["title"].ToString()
-                    });
-                }
-                reader.Close();
-                return ModuleList;
-            }
-            catch(Exception e)
-            {
-                return null;
-            }
-        }
 
-        public class Tree_Model
-        {
-            public long id;
-            public string title;
-            public string code;
-            public long HParentID;
-            public string HParentName;
-            public long HLevel;
-            public bool lazy;
-        }
-        public static SqlDataReader GetReader(string sql)
-        {
-            SqlConnection conn = new SqlConnection("Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True");
-            SqlCommand cmd = new SqlCommand(sql, conn);
-            try
-            {
-                conn.Open();
-                SqlDataReader objReader =
-                    cmd.ExecuteReader(CommandBehavior.CloseConnection);
-                return objReader;
-            }
-            catch (Exception ex)
-            {
-                conn.Close();
-                throw ex;
-            }
-            //finally
-            //{
-            //    conn.Close();
-            //    conn.Dispose();
-            //}
-        }
 
         //
     }
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 86f3ec7..77e9587 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -12,7 +12,7 @@
   <ItemGroup>
     <File Include="apiapp.json">
       <publishTime>04/12/2021 11:33:15</publishTime>
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -21,19 +21,19 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>04/26/2020 09:57:16</publishTime>
@@ -51,7 +51,7 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
@@ -60,13 +60,13 @@
       <publishTime>01/04/2011 13:48:18</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/15/2015 17:57:08</publishTime>
@@ -132,7 +132,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -165,10 +165,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>05/06/2021 18:11:32</publishTime>
+      <publishTime>05/10/2021 08:40:19</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>05/06/2021 18:11:32</publishTime>
+      <publishTime>05/10/2021 08:40:19</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>02/04/2021 21:35:21</publishTime>
@@ -186,163 +186,163 @@
       <publishTime>03/26/2019 14:23:20</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/21/2021 13:19:40</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>05/06/2021 09:48:41</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>05/06/2021 18:11:36</publishTime>
+      <publishTime>05/10/2021 08:40:34</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1