From 190aef7767ac9122e6bc975f5ddba8d3625be90d Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期日, 16 十一月 2025 15:29:21 +0800
Subject: [PATCH] 优化

---
 WebApi/Gs.Sys/Services/FmController.cs |   42 +++++++++++++++---------------------------
 1 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 4ee54e0..88a8cc0 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -328,37 +328,25 @@
                 if (dset.Tables[0].Rows.Count <= 0)
                     return "";
                 //杩欐槸鏅�氱殑鎺ュ彛
-                if (string.IsNullOrEmpty(idtype))
+                string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
+                dynamic _datajson = new ExpandoObject();
+                if (dset.Tables.Count > 1)
                 {
-                    string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
-                    dynamic _datajson = new ExpandoObject();
-                    if (dset.Tables.Count > 1)
+                    //杩欐槸杩欐槸鏅�氱殑鎺ュ彛閲岀殑缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
+                    if (keyMeth.ToLower() == "toclose".ToLower() || keyMeth.ToLower() == "closure".ToLower() || keyMeth.ToLower() == "unfinish")
                     {
-                        //杩欐槸杩欐槸鏅�氱殑鎺ュ彛閲岀殑缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
-                        if (keyMeth.ToLower() == "toclose".ToLower() || keyMeth.ToLower() == "closure".ToLower() || keyMeth.ToLower() == "unfinish")
-                        {
-                            _datajson = dset.Tables[1].Rows[0].RowToDynamic();
-                        }
-                        else
-                        {
-                            _datajson = dset.Tables[0].Rows[0].RowToDynamic();
-                            List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
-                            ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
-                        }
+                        _datajson = dset.Tables[1].Rows[0].RowToDynamic();
                     }
-                    /*var _obj = new
-                           {
-                               mesid = _mesGuid,
-                               taskname = keyTaskName,
-                               optype = keyMeth,
-                               datajson = JsonConvert.SerializeObject(_datajson),
-                           };
-                           return JsonConvert.SerializeObject(_obj);*/
-
-                    return JsonConvert.SerializeObject(_datajson); 
+                    else
+                    {
+                        _datajson = dset.Tables[0].Rows[0].RowToDynamic();
+                        List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
+                        ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
+                    }
                 }
+                return JsonConvert.SerializeObject(_datajson); 
                 //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
-                List<dynamic> _datajson22 = new List<dynamic>();
+                /*List<dynamic> _datajson22 = new List<dynamic>();
                 dynamic _ob = new ExpandoObject();
                 _ob.ENTRY = dset.Tables[0].TableToDynamicList();
                 _datajson22.Add(_ob);
@@ -368,7 +356,7 @@
                     idtype = idtype,
                     datajson = JsonConvert.SerializeObject(_datajson22),
                 };
-                return JsonConvert.SerializeObject(_obj22);
+                return JsonConvert.SerializeObject(_obj22);*/
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3