From eb81b325e971051ea29c48a033cfc6c759f1dc60 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 四月 2021 17:09:45 +0800
Subject: [PATCH] treetest

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

diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index b074dc4..224833f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -509,27 +509,44 @@
 
         [Route("Gy_Department/LoadTree")]
         [HttpGet]
-        public object LoadTree_Json()
+        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)
+            //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");
+            if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏄剧ず澶辫触锛佸師鍥狅細" + DBUtility.ClsPub.sExeReturnInfo;
+                objJsonResult.Message = "false锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
             else
             {
-                objJsonResult.code = "0";
+                objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
-                objJsonResult.data = GetRegionList;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
                 return objJsonResult;
             }
         }
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index dd05597..d94aa78 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -12,28 +12,28 @@
   <ItemGroup>
     <File Include="apiapp.json">
       <publishTime>04/12/2021 11:33:15</publishTime>
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>04/13/2021 13:28:28</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>04/13/2021 13:28:28</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>04/13/2021 13:30:11</publishTime>
+      <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>04/13/2021 10:11:33</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>04/13/2021 10:11:33</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>04/13/2021 10:11:33</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/15/2015 17:57:08</publishTime>
@@ -108,7 +108,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>04/13/2021 13:30:39</publishTime>
+      <publishTime>11/28/2018 12:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,16 +132,16 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>04/13/2021 13:31:08</publishTime>
+      <publishTime>01/28/2015 04:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>04/13/2021 13:31:24</publishTime>
+      <publishTime>02/11/2014 15:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>04/13/2021 13:31:12</publishTime>
+      <publishTime>01/28/2015 04:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -165,10 +165,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>04/28/2021 10:18:38</publishTime>
+      <publishTime>04/29/2021 17:05:17</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>04/28/2021 10:18:38</publishTime>
+      <publishTime>04/29/2021 17:05:17</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>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>04/13/2021 10:11:33</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>04/13/2021 13:27:57</publishTime>
+      <publishTime>01/21/2021 13:19:40</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>04/13/2021 10:11:34</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/28/2021 10:18:49</publishTime>
+      <publishTime>04/29/2021 17:05:21</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1