From bd7f147b15efd57c5f054e537e715486c53c25dc Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 28 十一月 2025 17:08:34 +0800
Subject: [PATCH] 标准版
---
WebApi/Gs.JJGZ/MesDeToLineController.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesDeToLineController.cs b/WebApi/Gs.JJGZ/MesDeToLineController.cs
index 2ad1a5d..d441bf5 100644
--- a/WebApi/Gs.JJGZ/MesDeToLineController.cs
+++ b/WebApi/Gs.JJGZ/MesDeToLineController.cs
@@ -53,7 +53,7 @@
string orderBy = string.IsNullOrEmpty(sortName) ? "CREATE_DATE DESC" : $"{sortName} ASC";
// 鏌ヨ鎬绘暟
- string countSql = $"SELECT COUNT(1) FROM Mes_DepartmentToLine a WHERE 1=1 {whereClause}";
+ string countSql = $"SELECT COUNT(1) FROM Mes_DepartmentToLine a LEFT JOIN SYS_ORGANIZATION B ON A.OrgId = B.FID LEFT JOIN SYS_USER cj ON A.CREATE_BY = cj.ACCOUNT WHERE 1=1 {whereClause}";
var countResult = DbHelperSQL.GetSingle(countSql);
int intTotal = countResult != null ? Convert.ToInt32(countResult) : 0;
@@ -63,10 +63,14 @@
int offset = (currentPage - 1) * everyPageSize;
string dataSql = $@"
SELECT * FROM (
- SELECT ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum, A.*, b.Name as OrgName
+ SELECT
+ ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum,
+ A.*,
+ B.Name AS OrgName,
+ cj.USER_NAME AS CreateByName
FROM Mes_DepartmentToLine A
LEFT JOIN SYS_ORGANIZATION B ON A.OrgId = B.FID
-
+ LEFT JOIN SYS_USER cj ON A.CREATE_BY = cj.ACCOUNT
WHERE 1=1 {whereClause}
) AS T
WHERE T.RowNum BETWEEN {offset + 1} AND {offset + everyPageSize}";
@@ -108,7 +112,7 @@
string mainTable = "Mes_DepartmentToLine";
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