From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期五, 30 五月 2025 21:00:08 +0800 Subject: [PATCH] 合并冲突 --- WebAPI/Controllers/WebAPIController.cs | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index c0c90bf..1bcc961 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -21272,18 +21272,36 @@ //鑾峰彇鎵�鏈夋ā鍧楅〉闈� [Route("Web/ModePageList")] [HttpGet] - public object ModePageList() + public object ModePageList(string HMakeName, string HType) { try { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); - ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏� + + + string sql = "select * from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' and isnull(Hurl,'') like'%html%' order by HPosition"; + ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁 + if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅 + { + string sql1 = "select * from Gy_MenuDefineSet where HMakeName=" + + "(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " + + "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='" + HMakeName + "' order by len(c.GroupName )) and isnull(Hurl,'') like'%html%'"; + ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓� + if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0)) + { + sql = "Select * from h_v_Gy_Menu_1 Order by HPosition,len(HitemID),HitemID "; + ds = oCn.RunProcReturn(sql, "Gy_Menu_1"); + } + } + + + //ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu_1"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏� objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鏌ヨ鎴愬姛锛�"; - objJsonResult.data = ds; + objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) -- Gitblit v1.9.1