From bd7f147b15efd57c5f054e537e715486c53c25dc Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 28 十一月 2025 17:08:34 +0800
Subject: [PATCH] 标准版

---
 WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs b/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs
index 7928a26..0077343 100644
--- a/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs
@@ -99,11 +99,18 @@
         dynamic m = new ExpandoObject();
         m.list = new List<dynamic>();
         m.list2 = new List<dynamic>();
-        // 鍋囪涓昏〃涓篗ES_JJGZ_JS_SALARY锛屾槑缁嗚〃涓篗ES_JJGZ_JS_SALARY_DETAIL
         string mainTable = "MES_JJGZ_JSSALARY";
         try
         {
-            string sqlMain = $"SELECT * FROM {mainTable} WHERE guid='{guid}'";
+            string sqlMain = $@"
+SELECT 
+    a.*,
+    cj.USER_NAME AS createByName,
+    sh.USER_NAME AS checkUserName
+FROM {mainTable} a
+LEFT JOIN SYS_USER cj ON cj.ACCOUNT = a.create_by
+LEFT JOIN SYS_USER sh ON sh.ACCOUNT = a.CHECK_USER
+WHERE a.guid = '{guid}'";
             var dsMain = DbHelperSQL.Query(sqlMain);
             if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
             {

--
Gitblit v1.9.3