Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/NewPdaSqlServer

南骏 池

9 天以前 8390b66312a4fa11641b6216bb32c7715d18303c

Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/NewPdaSqlServer

 Dto/service/OaToMesRecord.cs

@@ -46,5 +46,6 @@
        public string Parentid { get; set; }

        public string Name { get; set; }
        public string OrgId { get; set; }
    }
}

 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++;
                                    }