SVN-Revision: r259
This commit is contained in:
cyf
2025-02-08 06:53:32 +00:00
parent e776f3bd62
commit 2d55f472c0
7 changed files with 20 additions and 147 deletions
+2 -25
View File
@@ -423,7 +423,7 @@ namespace Lskj.Business.Impl
string columsSql = string.Format(@"SELECT DISTINCT
isnull(CASE WHEN ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'' OR isnull(isVisible,0)=1 THEN 0 ELSE width END,0) width,
isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible,
isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible,CASE WHEN isnull(isVisible,0) = 0 THEN 0 ELSE 1 END vislble,
a.id,a.fieldName,isnull(a.[sysName],'') sysName,a.username,a.dataFormat,a.fieldTypeId fieldsqltag,a.calcOrder,a.isSum,a.defaultValue defaultdate,{2}
a.lookupKeyField fieldsqlid,a.lookupResult fieldsqlname,a.lookupSql fieldsql,a.calcExpr,a.orderid,isnull(a.nullable,0) nullable,a.unionFields,a.unionValue {3}{4}
FROM p_systembillDetail a
@@ -863,27 +863,4 @@ namespace Lskj.Business.Impl
SqlParameter[] param =
{
new SqlParameter("@FormText",SqlDbType.VarChar,50),
new SqlParameter("@userId",SqlDbType.Int,20),
new SqlParameter("@UserName",SqlDbType.VarChar,50),
new SqlParameter("@Privilege",SqlDbType.Int,4),
new SqlParameter("@ModuleCode",SqlDbType.VarChar,50),
new SqlParameter("@ModuleId",SqlDbType.VarChar,50),
};
param[0].Value = SysModel.FormText;
param[1].Value = ERPInfo.Instance.UserId;
param[2].Value = ERPInfo.Instance.UserName;
param[3].Value = SysModel.Privilege;
param[4].Value = SysModel.ModuleCode;
param[5].Value = SysModel.ModuleId;
ds = SqlHelper.ExecuteDataSet(CommandType.StoredProcedure, "p_Get_NewDesignPlatform_PubAccraditation2", "cacheSYSConfig", param);
return ds;
}
}
}
new Sq
+2 -29
View File
@@ -284,6 +284,7 @@ namespace Lskj.Business
//Instance.OptimizationSpeed = false;
Instance.DetailExportDisplay = item.Table.Columns.Contains("DetailExportDisplay") && !string.IsNullOrEmpty(item["DetailExportDisplay"] + "") ? "1".Equals(item["DetailExportDisplay"] + "") : false;
Instance.ConventionalPrintingDisplay = item.Table.Columns.Contains("ConventionalPrintingDisplay") && !string.IsNullOrEmpty(item["ConventionalPrintingDisplay"] + "") ? "1".Equals(item["ConventionalPrintingDisplay"] + "") : false;
Instance.HideSubtitle = item.Table.Columns.Contains("HideSubtitle") && !string.IsNullOrEmpty(item["HideSubtitle"] + "") ? "1".Equals(item["HideSubtitle"] + "") : false;
}
/// <summary>
/// 高拍仪AccessKey
@@ -902,32 +903,4 @@ namespace Lskj.Business
/// <summary>
///mac地址强制判断(必须指定电脑,未指定的不允许登录)
/// </summary>
public bool MacMandatoryJudgment;
/// <summary>
///高效验证(表格重新加载数据前,验证是否有新增或者修改状态的列)
/// </summary>
public bool EfficientVerification;
/// <summary>
///粘贴时不清除表格排序
/// </summary>
public bool CancelPasteClearSort;
/// <summary>
///树结构特殊加载(数据源中有Pid列,则pid设置为对应节点的父节点)
/// </summary>
public bool TreeSpecialBinding;
/// <summary>
///优化速度加载
/// </summary>
public bool OptimizationSpeed;
/// <summary>
///明细导出显示
/// </summary>
public bool DetailExportDisplay;
/// <summary>
///常规打印显示
/// </summary>
public bool ConventionalPrintingDisplay;
}
}
public bool MacMandatoryJudgme