diff --git a/插件库/Lskj.Business/Impl/MainImpl.cs b/插件库/Lskj.Business/Impl/MainImpl.cs
index 14bc433..0351fbd 100644
--- a/插件库/Lskj.Business/Impl/MainImpl.cs
+++ b/插件库/Lskj.Business/Impl/MainImpl.cs
@@ -482,7 +482,7 @@ namespace Lskj.Business.Impl
//if (HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
// fields += ",DefaultLedger";
- string sqlValue = string.Format("select EmployeeId UserId,LoginAccount UserCode,EmployeeName UserName,LoginAccount remark {1} from P_EmployeeTab WHERE sign=0 and UseFlag=1 {0} order by loginaccount", sqlWhere, fields);
+ string sqlValue = string.Format("select EmployeeId UserId,LoginAccount UserCode,EmployeeName UserName,LoginAccount 工号 {1} from P_EmployeeTab WHERE sign=0 and UseFlag=1 {0} order by loginaccount", sqlWhere, fields);
return SqlHelper.ExecuteDataTable(sqlValue);
}
@@ -1167,31 +1167,4 @@ namespace Lskj.Business.Impl
/// 版本:1.0
///
/// System.String.
- public static bool CheckingMacAddress(string userId)
- {
- try
- {
- if (HasExistsTable("P_MacAddressTable"))
- {
- 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(SystemInfo.Instance.MacMandatoryJudgment&& dataRow==null) return false;
- if (dataRow != null&&!string.IsNullOrWhiteSpace(dataRow["MacAddress"] + ""))
- {
- List MacAddress = ((dataRow["MacAddress"] + "").Split(',')).ToList();
- return MacAddress.Contains(ERPInfo.Instance.MacAddress);
- }
- }
-
- }
- catch (Exception ex)
- {
- return false;
- }
-
- return true;
- }
-
-
- }
-}
\ No newline at end of file
+ public static
\ No newline at end of file
diff --git a/插件库/Lskj.Business/Impl/SystemInfo.cs b/插件库/Lskj.Business/Impl/SystemInfo.cs
index eb428f9..a948541 100644
--- a/插件库/Lskj.Business/Impl/SystemInfo.cs
+++ b/插件库/Lskj.Business/Impl/SystemInfo.cs
@@ -657,7 +657,7 @@ namespace Lskj.Business
///
public bool isFlowLayout;
///
- /// 单据来源刷新点击模式,默认单击,1为双击
+ /// 单据来源刷新点击模式,默认单击,1为双击(已弃用。2025-02-18杨华提出改成每个来源去单独配置)
///
public bool IsBillDoubleClick;
///