SVN r499
SVN-Revision: r499
This commit is contained in:
@@ -54,7 +54,7 @@ namespace Lskj.Business.Impl
|
||||
int result = ExecSqlValue(detailSql, true);
|
||||
if (result > 0)
|
||||
{
|
||||
SqlParameter pMsg = ERPInfo.Instance.ChangeParameterType ? new SqlParameter("@msg", SqlDbType.NVarChar, 4000) :new SqlParameter("@msg", SqlDbType.VarChar, 2000);
|
||||
SqlParameter pMsg = ERPInfo.Instance.ChangeParameterType ? new SqlParameter("@msg", SqlDbType.NVarChar, 4000) : new SqlParameter("@msg", SqlDbType.VarChar, 2000);
|
||||
pMsg.Direction = ParameterDirection.Output;
|
||||
SqlParameter returnValue = new SqlParameter("@return", SqlDbType.Int, 4);
|
||||
returnValue.Direction = ParameterDirection.ReturnValue;
|
||||
@@ -590,15 +590,30 @@ namespace Lskj.Business.Impl
|
||||
conditions = "and isnull(mxflag,0)=0";
|
||||
}
|
||||
string cond = !string.IsNullOrEmpty(sourceCond) ? string.Format(" and id in ({0})", sourceCond.Trim(',')) : string.Empty;
|
||||
string sqlValue = string.Format("select * from p_systembillsource where typeCode=@typeCode" + cond + " and isnull(isVisible,0)=0 and (isnull(viewOper,'')='' or CHARINDEX(',' + '{0}' + ',', ',' + viewOper + ',')>0) order by orderid", ERPInfo.Instance.UserName);
|
||||
string sqlDetail = string.Format(@"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
|
||||
FROM p_systembillsourcedetail a
|
||||
LEFT JOIN (
|
||||
SELECT userList,privTypeId from p_systemPrivilege b where modId = '{0}'
|
||||
AND CHARINDEX(',' + '{1}' + ',', ',' + userList + ',') > 0
|
||||
) b on CHARINDEX(',' + CAST(b.privTypeId AS VARCHAR(5)) + ',',',' + PrivilegeView + ',') > 0
|
||||
where sourceId in (select id from p_systembillsource where typeCode=@typeCode" + cond + " and isnull(isVisible,0)=0 and (isnull(viewOper,'')='' or CHARINDEX(',' + '{1}' + ',', ',' + viewOper + ',')>0)) {3} order by sourceId,orderid", menuCode, ERPInfo.Instance.UserName, otherfield, conditions);
|
||||
string sqlValue = string.Format(@"WITH UserRoles AS (
|
||||
SELECT r.roleName
|
||||
FROM p_systemRoleOperSetTab AS ro
|
||||
JOIN p_systemRoleSetTab AS r ON r.id = ro.roleId
|
||||
WHERE ro.operatorname = '{0}'
|
||||
)
|
||||
select * from p_systembillsource where typeCode=@typeCode" + cond +
|
||||
@" and isnull(isVisible,0)=0 and (isnull(viewOper,'')='' or CHARINDEX(',' + '{0}' + ',', ',' + viewOper + ',')>0 OR EXISTS (
|
||||
SELECT 1 FROM UserRoles AS ur WHERE CHARINDEX('{{&' + ur.roleName + '&}}', viewOper) > 0)) order by orderid", ERPInfo.Instance.UserName);
|
||||
string sqlDetail = string.Format(@"WITH UserRoles AS (
|
||||
SELECT r.roleName
|
||||
FROM p_systemRoleOperSetTab AS ro
|
||||
JOIN p_systemRoleSetTab AS r ON r.id = ro.roleId
|
||||
WHERE ro.operatorname = '{0}'
|
||||
)
|
||||
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
|
||||
FROM p_systembillsourcedetail a
|
||||
LEFT JOIN (
|
||||
SELECT userList,privTypeId from p_systemPrivilege b where modId = '{0}'
|
||||
AND CHARINDEX(',' + '{1}' + ',', ',' + userList + ',') > 0
|
||||
) b on CHARINDEX(',' + CAST(b.privTypeId AS VARCHAR(5)) + ',',',' + PrivilegeView + ',') > 0
|
||||
where sourceId in (select id from p_systembillsource where typeCode=@typeCode" + cond + @" and isnull(isVisible,0)=0 and (isnull(viewOper,'')='' or CHARINDEX(',' + '{1}' + ',', ',' + viewOper + ',')>0) OR EXISTS (
|
||||
SELECT 1 FROM UserRoles AS ur WHERE CHARINDEX('{{&' + ur.roleName + '&}}', viewOper) > 0)) {3} order by sourceId,orderid", menuCode, ERPInfo.Instance.UserName, otherfield, conditions);
|
||||
|
||||
htTable["master"] = SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@typeCode", menuCode) });
|
||||
htTable["detail"] = SqlHelper.ExecuteDataTable(sqlDetail, new SqlParameter[] { new SqlParameter("@typeCode", menuCode) });
|
||||
|
||||
Reference in New Issue
Block a user