From 8390b66312a4fa11641b6216bb32c7715d18303c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 28 八月 2025 10:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/NewPdaSqlServer
---
service/JJGZ/OaToMesRecordManager.cs | 6 ++++--
Dto/service/OaToMesRecord.cs | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Dto/service/OaToMesRecord.cs b/Dto/service/OaToMesRecord.cs
index 94c48c1..b6906d5 100644
--- a/Dto/service/OaToMesRecord.cs
+++ b/Dto/service/OaToMesRecord.cs
@@ -46,5 +46,6 @@
public string Parentid { get; set; }
public string Name { get; set; }
+ public string OrgId { get; set; }
}
}
diff --git a/service/JJGZ/OaToMesRecordManager.cs b/service/JJGZ/OaToMesRecordManager.cs
index d0c5129..8ddc4fa 100644
--- a/service/JJGZ/OaToMesRecordManager.cs
+++ b/service/JJGZ/OaToMesRecordManager.cs
@@ -168,12 +168,13 @@
if (exists)
{
// 鏇存柊
- var updateSql = @"UPDATE OA_DEPARTMENT SET name = @Name, Parentid = @Parentid WHERE Id = @Id";
+ var updateSql = @"UPDATE OA_DEPARTMENT SET name = @Name, Parentid = @Parentid, OrgId = @OrgId WHERE Id = @Id";
using (var updateCmd = new SqlCommand(updateSql, conn, tran))
{
updateCmd.Parameters.AddWithValue("@Id", item.Id);
updateCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
updateCmd.Parameters.AddWithValue("@Parentid", item.Parentid ?? (object)DBNull.Value);
+ updateCmd.Parameters.AddWithValue("@OrgId", item.OrgId ?? (object)DBNull.Value);
int rows = updateCmd.ExecuteNonQuery();
if (rows > 0) updateCount++;
}
@@ -181,12 +182,13 @@
else
{
// 鎻掑叆
- var insertSql = @"INSERT INTO OA_DEPARTMENT (id, name, Parentid) VALUES (@Id, @Name, @Parentid)";
+ var insertSql = @"INSERT INTO OA_DEPARTMENT (id, name, Parentid, OrgId) VALUES (@Id, @Name, @Parentid, @OrgId)";
using (var insertCmd = new SqlCommand(insertSql, conn, tran))
{
insertCmd.Parameters.AddWithValue("@Id", item.Id);
insertCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
insertCmd.Parameters.AddWithValue("@Parentid", item.Parentid ?? (object)DBNull.Value);
+ insertCmd.Parameters.AddWithValue("@OrgId", item.OrgId ?? (object)DBNull.Value);
int rows = insertCmd.ExecuteNonQuery();
if (rows > 0) insertCount++;
}
--
Gitblit v1.9.3