SVN r874
SVN-Revision: r874
This commit is contained in:
@@ -723,10 +723,11 @@ namespace Lskj.Business.Impl
|
|||||||
{
|
{
|
||||||
SqlHelper.ExecuteNonQuery("alter table P_MessageToolLinkDllTab add cardId int");
|
SqlHelper.ExecuteNonQuery("alter table P_MessageToolLinkDllTab add cardId int");
|
||||||
}
|
}
|
||||||
string sqlValue = string.Format("select a.*,b.PurviewId,b.MouseOutImg,b.MouseOverImg1,b.DllFileName from(select * from P_MessageToolLinkDllTab where employeeid={0} and ( grouptagid=2 or grouptagid=1) and isnull(cardId,0) !=-99 "
|
string sqlValue = string.Format("select a.*,b.PurviewId,b.MouseOutImg,b.MouseOverImg1,b.DllFileName,z.SubSysName,b.menucaption from(select * from P_MessageToolLinkDllTab where employeeid={0} and ( grouptagid=2 or grouptagid=1) and isnull(cardId,0) !=-99 "
|
||||||
+ " union "
|
+ " union "
|
||||||
+ " select * from P_MessageToolLinkDllTab where cardId=-99 and ( grouptagid=2 or grouptagid=1) "
|
+ " select * from P_MessageToolLinkDllTab where cardId=-99 and ( grouptagid=2 or grouptagid=1) "
|
||||||
+ ")a join p_formmenuconfigtab b on a.LMenuId=b.MenuId where LinkModeTag=1 order by grouptagid,ItemTagId", ERPInfo.Instance.UserId);
|
+ ")a join p_formmenuconfigtab b on a.LMenuId=b.MenuId" +
|
||||||
|
" left join P_SubSystemTab z on a.LSubSysId=z.SubSysId where LinkModeTag=1 order by grouptagid,ItemTagId", ERPInfo.Instance.UserId);
|
||||||
|
|
||||||
return SqlHelper.ExecuteDataTable(sqlValue);
|
return SqlHelper.ExecuteDataTable(sqlValue);
|
||||||
}
|
}
|
||||||
@@ -1174,7 +1175,7 @@ namespace Lskj.Business.Impl
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (SystemInfo.Instance.MacMandatoryJudgment)
|
if (SystemInfo.Instance.MacMandatoryJudgment)
|
||||||
{
|
{
|
||||||
if (HasExistsTable("P_MacAddressTable"))
|
if (HasExistsTable("P_MacAddressTable"))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user