From 3e79b9a054cbbf34c4790990bac012bde783b2d1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 28 二月 2026 13:31:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b1aebc8..f45529d 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -23298,12 +23298,6 @@
oCN.BeginTran();
try
{
- LogService.Write($@"exec h_p_SetGy_UserClientIdRelation
- @HUserbm=N'{msg["HUserbm"].ToString()}',
- @HUserName=N'{msg["HUserName"].ToString()}',
- @HClientID=N'{msg["HClientID"].ToString()}',
- @HOnline={msg["HOnline"].ToString()}
- ", "h_p_SetGy_UserClientIdRelation");
ds = oCN.RunProcReturn($@"exec h_p_SetGy_UserClientIdRelation
@HUserbm=N'{msg["HUserbm"].ToString()}',
@HUserName=N'{msg["HUserName"].ToString()}',
@@ -23346,7 +23340,23 @@
[HttpGet]
public object getMessageIdentified(string user, string moduleName)
{
- return null;
+ DataSet oDs = oCN.RunProcReturn($"exec h_p_getMessageIdentifier_APP '{user}', '{moduleName}'", "h_p_getMessageIdentifier_APP");
+ if(oDs == null || oDs.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 = "鑾峰彇娑堟伅鏍囪瘑鎴愬姛锛�";
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult;
+ }
}
#endregion
}
--
Gitblit v1.9.1