From a619299816f2f632c7c6ba3a1bb869e2c212797d Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 19 十二月 2025 14:12:33 +0800
Subject: [PATCH] 对添加巡检单物料编码进行去重
---
StandardPda/MES.Service/service/LoginService.cs | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/StandardPda/MES.Service/service/LoginService.cs b/StandardPda/MES.Service/service/LoginService.cs
index f123d70..819823f 100644
--- a/StandardPda/MES.Service/service/LoginService.cs
+++ b/StandardPda/MES.Service/service/LoginService.cs
@@ -1,6 +1,6 @@
-锘縰sing MES.Service.DB;
-using System.Data;
+锘縰sing System.Data;
using System.Text;
+using MES.Service.DB;
namespace MES.Service.service;
@@ -16,7 +16,7 @@
SELECT LISTAGG(ROLEID, ',') WITHIN GROUP (ORDER BY ROLEID) AS ROLEIDS,userid
FROM SYS_USER_ROLE
GROUP BY userid
- )B on b.USERID=a.FID where FCODE = '{0}'",
+ )B on b.USERID=a.FID where upper(FCODE)=upper('{0}')",
name);
var dataTable = SQLHelper.ExecuteQuery(sql);
if (dataTable.Rows.Count <= 0) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
@@ -33,22 +33,57 @@
{
var sql = "";
- if ("PL017".Equals(name))
- sql = "select PAGE_VIEW,PATH,ICOIMG from MES_SYS_PAGEVIEW";
- else
- sql = string.Format(@"select PAGE_VIEW,PATH,ICOIMG
- from (select PAGE_VIEW,PATH,ICOIMG
- from MES_SYS_GUP_USER a
- join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
- join SYS_USER_ROLE c on to_char(c.ROLEID) = a.ROLEID
- where USERID = (select fid from SYS_USER where FCODE = '{0}')
- union all
- select PAGE_VIEW,PATH,ICOIMG
- from MES_SYS_GUP_USER a
- join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
- where a.ROLEID = (select FCODE from SYS_USER where FCODE = '{0}'))
- group by PATH, PAGE_VIEW, ICOIMG", name);
+ // if ("PL017".Equals(name))
+ // sql = "select PAGE_VIEW,PATH,ICOIMG from MES_SYS_PAGEVIEW";
+ // else
+ // sql = string.Format(@"select PAGE_VIEW,PATH,ICOIMG
+ // from (select PAGE_VIEW,PATH,ICOIMG
+ // from MES_SYS_GUP_USER a
+ // join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
+ // join SYS_USER_ROLE c on to_char(c.ROLEID) = a.ROLEID
+ // where USERID = (select fid from SYS_USER where FCODE = '{0}')
+ // union all
+ // select PAGE_VIEW,PATH,ICOIMG
+ // from MES_SYS_GUP_USER a
+ // join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
+ // where a.ROLEID = (select FCODE from SYS_USER where FCODE = '{0}'))
+ // group by PATH, PAGE_VIEW, ICOIMG", name);
+ // return SQLHelper.ExecuteQuery(sql);
+ //}
+
+
+
+ if ("PL017".Equals(name))
+ {
+ // 瓒呯骇绠＄悊鍛樻煡璇㈠叏閮ㄨ彍鍗曪紝骞舵寜 SORT_NO 鎺掑簭
+ sql = @"
+ select PAGE_VIEW, PATH, ICOIMG, SORT_NO
+ from MES_SYS_PAGEVIEW
+ order by SORT_NO asc";
+ }
+ else
+ {
+ // 鏅�氱敤鎴风殑鏉冮檺鏌ヨ
+ sql = string.Format(@"
+ select PAGE_VIEW, PATH, ICOIMG, SORT_NO
+ from (
+ select PAGE_VIEW, PATH, ICOIMG, SORT_NO
+ from MES_SYS_GUP_USER a
+ join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
+ join SYS_USER_ROLE c on to_char(c.ROLEID) = a.ROLEID
+ where USERID = (select fid from SYS_USER where FCODE = '{0}')
+
+ union all
+
+ select PAGE_VIEW, PATH, ICOIMG, SORT_NO
+ from MES_SYS_GUP_USER a
+ join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
+ where a.ROLEID = (select FCODE from SYS_USER where FCODE = '{0}')
+ )
+ group by PAGE_VIEW, PATH, ICOIMG, SORT_NO
+ order by SORT_NO asc", name);
+ }
return SQLHelper.ExecuteQuery(sql);
}
--
Gitblit v1.9.3