From ae4902061bc8e34f341d55b85f28acdf24d3b9dc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:41:51 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/ReportPlatFormController.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index badc91b..2daaede 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -59,6 +59,46 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴鏍规嵁璐ｄ换浜虹瓫閫夊姞杞借祫婧愬垪琛�
+ [Route("ReportPlatForm/SearchGetLineBindBillListStatus")]
+ [HttpGet]
+ public object SearchGetLineBindBillListStatus(string HUserName,string HStatus)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetSourceInfoByUser " + HUserName + ",'" + HStatus + "'", "h_p_JIT_GetSourceInfoByUser");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region 鎶ュ伐骞冲彴璧勬簮淇濆瓨
/// <summary>
/// 鎶ュ伐骞冲彴璧勬簮淇濆瓨
@@ -292,6 +332,11 @@
ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 鐢ㄦ埛鍚嶇О='" + user+ "' order by 鎸夐挳鎺掑簭", "h_v_Gy_UserButton");
+ if (ds.Tables[0]==null || ds.Tables[0].Rows.Count <1)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 鐢ㄦ埛鍚嶇О='admin' order by 鎸夐挳鎺掑簭", "h_v_Gy_UserButton");
+ }
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
--
Gitblit v1.9.1