cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r966

Browse Source 
SVN-Revision: r966
This commit is contained in:
cyf
2025-09-05 08:13:50 +00:00
parent 4094450dcf
commit 9d437b99c0
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/BaseAuditImpl.cs
+3 -2
View File
@@ -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); SqlParameter msg = ERPInfo.Instance.ChangeParameterType ? new SqlParameter("@msg", SqlDbType.NVarChar, 6000) : new SqlParameter("@msg", SqlDbType.VarChar, 3000);
msg.Direction = ParameterDirection.Output; msg.Direction = ParameterDirection.Output;
SqlParameter NextSelectStepCode = new SqlParameter("@nextSelectStepCode", SqlDbType.VarChar, 3000); SqlParameter NextSelectStepCode = new SqlParameter("@nextSelectStepCode", SqlDbType.VarChar, 3000);
msg.Direction = ParameterDirection.Output; NextSelectStepCode.Direction = ParameterDirection.Output;
SqlParameter NextSelectStepOper = new SqlParameter("@nextSelectStepOper", SqlDbType.VarChar, 3000); SqlParameter NextSelectStepOper = new SqlParameter("@nextSelectStepOper", SqlDbType.VarChar, 3000);
msg.Direction = ParameterDirection.Output; NextSelectStepOper.Direction = ParameterDirection.Output;
List<SqlParameter> list = new List<SqlParameter> List<SqlParameter> list = new List<SqlParameter>
{ {
new SqlParameter("@typeCode",SqlDbType.VarChar,10), new SqlParameter("@typeCode",SqlDbType.VarChar,10),
@@ -130,6 +130,7 @@ namespace Lskj.Business.Impl
} }
if (ret) list.Add(new SqlParameter("@backStepCode", SqlDbType.Int, 4)); if (ret) list.Add(new SqlParameter("@backStepCode", SqlDbType.Int, 4));
SqlParameter[] param = list.ToArray(); SqlParameter[] param = list.ToArray();
param[0].Value = sysModel.ModuleCode; param[0].Value = sysModel.ModuleCode;
param[1].Value = string.IsNullOrEmpty(stepCode) ? 0 : Convert.ToInt32(stepCode); param[1].Value = string.IsNullOrEmpty(stepCode) ? 0 : Convert.ToInt32(stepCode);
插件库/Lskj.Business/Impl/BillImpl.cs
+3 -1
View File
@@ -482,6 +482,8 @@ namespace Lskj.Business.Impl
sumCond += ",a.enableCond"; sumCond += ",a.enableCond";
if (HasExistsColumn("p_systembillDetail", "labelText")) if (HasExistsColumn("p_systembillDetail", "labelText"))
sumCond += ",a.labelText"; sumCond += ",a.labelText";
if (HasExistsColumn("p_systembillDetail", "disableCond"))
sumCond += ",a.disableCond";
if (HasExistsColumn("p_systembillDetail", "canCopy")) if (HasExistsColumn("p_systembillDetail", "canCopy"))
sumCond += ",a.canCopy"; sumCond += ",a.canCopy";
@@ -636,7 +638,7 @@ namespace Lskj.Business.Impl
SELECT r.roleName SELECT r.roleName
FROM p_systemRoleOperSetTab AS ro FROM p_systemRoleOperSetTab AS ro
JOIN p_systemRoleSetTab AS r ON r.id = ro.roleId 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} 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 isnull(CASE WHEN isVisible=1 OR (ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'') THEN 0 ELSE width END,0) width
插件库/Lskj.Business/Impl/MainImpl.cs
+1 -1
View File
@@ -1181,7 +1181,7 @@ namespace Lskj.Business.Impl
{ {
DataTable table = SqlHelper.ExecuteDataTable(string.Format("select MacAddress from P_MacAddressTable where userid='{0}'", userId)); 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; 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"] + "")) if (dataRow != null && !string.IsNullOrWhiteSpace(dataRow["MacAddress"] + ""))
{ {
List<string> MacAddress = ((dataRow["MacAddress"] + "").Split(',')).ToList(); List<string> MacAddress = ((dataRow["MacAddress"] + "").Split(',')).ToList();