From 9d437b99c05303fbf4205b3c150389d41904d07d Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Fri, 5 Sep 2025 08:13:50 +0000
Subject: [PATCH] SVN r966

SVN-Revision: r966
---
 插件库/Lskj.Business/Impl/BaseAuditImpl.cs | 5 +++--
 插件库/Lskj.Business/Impl/BillImpl.cs      | 4 +++-
 插件库/Lskj.Business/Impl/MainImpl.cs      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/插件库/Lskj.Business/Impl/BaseAuditImpl.cs b/插件库/Lskj.Business/Impl/BaseAuditImpl.cs
index 5fd0cfd..da8bf88 100644
--- a/插件库/Lskj.Business/Impl/BaseAuditImpl.cs
+++ b/插件库/Lskj.Business/Impl/BaseAuditImpl.cs
@@ -102,9 +102,9 @@ namespace Lskj.Business.Impl
             SqlParameter msg = ERPInfo.Instance.ChangeParameterType ? new SqlParameter("@msg", SqlDbType.NVarChar, 6000) : new SqlParameter("@msg", SqlDbType.VarChar, 3000);
             msg.Direction = ParameterDirection.Output;
             SqlParameter NextSelectStepCode = new SqlParameter("@nextSelectStepCode", SqlDbType.VarChar, 3000);
-            msg.Direction = ParameterDirection.Output;
+            NextSelectStepCode.Direction = ParameterDirection.Output;
             SqlParameter NextSelectStepOper = new SqlParameter("@nextSelectStepOper", SqlDbType.VarChar, 3000);
-            msg.Direction = ParameterDirection.Output;
+            NextSelectStepOper.Direction = ParameterDirection.Output;
             List<SqlParameter> list = new List<SqlParameter>
                 {
                     new SqlParameter("@typeCode",SqlDbType.VarChar,10),
@@ -130,6 +130,7 @@ namespace Lskj.Business.Impl
             }
 
             if (ret) list.Add(new SqlParameter("@backStepCode", SqlDbType.Int, 4));
+
             SqlParameter[] param = list.ToArray();
             param[0].Value = sysModel.ModuleCode;
             param[1].Value = string.IsNullOrEmpty(stepCode) ? 0 : Convert.ToInt32(stepCode);
diff --git a/插件库/Lskj.Business/Impl/BillImpl.cs b/插件库/Lskj.Business/Impl/BillImpl.cs
index 9f62d55..ec29d73 100644
--- a/插件库/Lskj.Business/Impl/BillImpl.cs
+++ b/插件库/Lskj.Business/Impl/BillImpl.cs
@@ -482,6 +482,8 @@ namespace Lskj.Business.Impl
                 sumCond += ",a.enableCond";
             if (HasExistsColumn("p_systembillDetail", "labelText"))
                 sumCond += ",a.labelText";
+            if (HasExistsColumn("p_systembillDetail", "disableCond"))
+                sumCond += ",a.disableCond";
 
             if (HasExistsColumn("p_systembillDetail", "canCopy"))
                 sumCond += ",a.canCopy";
@@ -636,7 +638,7 @@ namespace Lskj.Business.Impl
                                                 SELECT  r.roleName
                                                 FROM p_systemRoleOperSetTab AS ro
 			                                    JOIN p_systemRoleSetTab AS r ON r.id = ro.roleId
-			                                    WHERE ro.operatorname = '{0}'
+			                                    WHERE ro.operatorname = '{1}'
 			                                    )
                                                  SELECT id,sourceId,fieldName,sysName,userName,orderid,isVisible,sourceKey,privilegeView,DataFormat,isSum,ifmerge,{2}
                                                  isnull(CASE WHEN isVisible=1 OR (ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'') THEN 0 ELSE width END,0) width
diff --git a/插件库/Lskj.Business/Impl/MainImpl.cs b/插件库/Lskj.Business/Impl/MainImpl.cs
index 37f01e2..6e3c26c 100644
--- a/插件库/Lskj.Business/Impl/MainImpl.cs
+++ b/插件库/Lskj.Business/Impl/MainImpl.cs
@@ -1181,7 +1181,7 @@ namespace Lskj.Business.Impl
                     {
                         DataTable table = SqlHelper.ExecuteDataTable(string.Format("select MacAddress from P_MacAddressTable where userid='{0}'", userId));
                         DataRow dataRow = table != null && table.Rows.Count > 0 ? table.Rows[0] : null;
-                        if (dataRow == null) return false;
+                        //if (dataRow == null) return false;  没有配置就默认成功
                         if (dataRow != null && !string.IsNullOrWhiteSpace(dataRow["MacAddress"] + ""))
                         {
                             List<string> MacAddress = ((dataRow["MacAddress"] + "").Split(',')).ToList();