From 17ea6bba570df1f10bf203c7577054d6d7b43a2a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 22 十月 2021 15:34:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PublicPageMethodController.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 97ad142..b3d3f89 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -122,9 +122,9 @@
#endregion
- #region 閫夋嫨鐢ㄦ埛鍩虹璧勬枡
+ #region 閫夋嫨鑱屽憳鍩虹璧勬枡
- #region 鏉′欢鏌ヨ鐢ㄦ埛鍒楄〃
+ #region 鏉′欢鏌ヨ鑱屽憳鍒楄〃
[Route("PublicPageMethod/UserList")]
[HttpGet]
public object UserList(string sWhere)
@@ -161,7 +161,7 @@
}
#endregion
- #region 鏍规嵁鏍戝瀷id鏌ユ壘鐢ㄦ埛鍒楄〃
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘鑱屽憳鍒楄〃
[Route("Gy_MaintenanceMode/UserCX")]
[HttpGet]
public object UserCX(long HInterID)
@@ -198,7 +198,7 @@
}
#endregion
- #region 鏍戝瀷鍒楄〃鐢ㄦ埛鍒楄〃鏁版嵁
+ #region 鏍戝瀷鍒楄〃鑱屽憳鍒楄〃鏁版嵁
[Route("Gy_MaintenanceMode/UserLoadTree")]
[HttpGet]
public object UserLoadTree(string sWhere)
@@ -3310,7 +3310,46 @@
#endregion
-
+ #region 閫夋嫨鐢ㄦ埛鍩虹璧勬枡
+ #region 鏉′欢鏌ヨ鐢ㄦ埛鍒楄〃
+ [Route("PublicPageMethod/PeopleList")]
+ [HttpGet]
+ public object PeopleList(string sWhere)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("Select czybm HNumber,czymc HName from h_v_Gy_UserList " + sWhere + " Order by czybm ", "h_v_Gy_UserList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵敤鎴锋暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
}
}
--
Gitblit v1.9.1