From 0180d68f232b8a30c28051f329b777274430c8f3 Mon Sep 17 00:00:00 2001 From: wyf Date: Thu, 17 Jul 2025 10:21:52 +0000 Subject: [PATCH] SVN r874 SVN-Revision: r874 --- 插件库/Lskj.Business/Impl/MainImpl.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/插件库/Lskj.Business/Impl/MainImpl.cs b/插件库/Lskj.Business/Impl/MainImpl.cs index 1c1f5ed..37f01e2 100644 --- a/插件库/Lskj.Business/Impl/MainImpl.cs +++ b/插件库/Lskj.Business/Impl/MainImpl.cs @@ -723,10 +723,11 @@ namespace Lskj.Business.Impl { 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 " + " 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); } @@ -1174,7 +1175,7 @@ namespace Lskj.Business.Impl { try { - if (SystemInfo.Instance.MacMandatoryJudgment) + if (SystemInfo.Instance.MacMandatoryJudgment) { if (HasExistsTable("P_MacAddressTable")) {