From 52c8a6814c248d07e2f8a7887805cdb7f90afa2c Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期日, 16 十一月 2025 12:50:05 +0800
Subject: [PATCH] 123

---
 WebApi/Gs.Sys/Services/FmController.cs |   82 ++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 4ee54e0..49e56f9 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -310,65 +310,49 @@
             string keyNo = model.keyNo;
             string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
             if (keyMeth.ToUpper() == "delete".ToUpper())
+            {
                 return "";
+            }
             try
             {
                 System.Data.DataSet dset = new System.Data.DataSet();
                 SqlParameter[] parameters =
-                      {
-                       new("@inOrderGuid", keyGuid),
-                       new("@inEdtUserGuid", keyUserGuid),
-                       new("@keyMeth", keyMeth.ToLower()),
-                   };
+                {
+                    new("@inOrderGuid", keyGuid),
+                    new("@inEdtUserGuid", keyUserGuid),
+                    new("@keyMeth", keyMeth.ToLower()),
+                };
                 dset = DbHelperSQL.RunProcedure(keyProduce, parameters, "0");
                 if (dset == null)
-                    return "";
-                if (dset.Tables.Count <= 0)
-                    return "";
-                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)
-                    {
-                        //杩欐槸杩欐槸鏅�氱殑鎺ュ彛閲岀殑缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
-                        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;
-                        }
-                    }
-                    /*var _obj = new
-                           {
-                               mesid = _mesGuid,
-                               taskname = keyTaskName,
-                               optype = keyMeth,
-                               datajson = JsonConvert.SerializeObject(_datajson),
-                           };
-                           return JsonConvert.SerializeObject(_obj);*/
-
-                    return JsonConvert.SerializeObject(_datajson); 
+                    return "";
                 }
-                //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
-                List<dynamic> _datajson22 = new List<dynamic>();
-                dynamic _ob = new ExpandoObject();
-                _ob.ENTRY = dset.Tables[0].TableToDynamicList();
-                _datajson22.Add(_ob);
-                var _obj22 = new
+                if (dset.Tables.Count <= 0)
                 {
-                    taskname = keyTaskName,
-                    idtype = idtype,
-                    datajson = JsonConvert.SerializeObject(_datajson22),
-                };
-                return JsonConvert.SerializeObject(_obj22);
+                    return "";
+                }
+                if (dset.Tables[0].Rows.Count <= 0)
+                {
+                    return "";
+                }
+                //杩欐槸鏅�氱殑鎺ュ彛
+                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")
+                    {
+                        _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;
+                    }
+                }
+                return JsonConvert.SerializeObject(_datajson); 
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3