From f8ffd9d30d2f8e333bcb798cc327eaf670c20182 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 12 Aug 2025 16:57:17 +0800
Subject: [PATCH] 1
---
SGGL/BLL/SysManage/DepartService.cs | 2 -
.../File/Excel/DataIn/人员信息模版.xls | Bin 19968 -> 19968 bytes
.../HSSE/SitePerson/PersonIn.aspx | 1 -
.../HSSE/SitePerson/PersonList.aspx | 3 +-
SGGL/FineUIPro.Web/common/PageBase.cs | 109 +++++++++---------
5 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/SGGL/BLL/SysManage/DepartService.cs b/SGGL/BLL/SysManage/DepartService.cs
index aa36222..74a09cc 100644
--- a/SGGL/BLL/SysManage/DepartService.cs
+++ b/SGGL/BLL/SysManage/DepartService.cs
@@ -5,8 +5,6 @@ namespace BLL
{
public static class DepartService
{
- public static Model.CNPCDB db = Funs.DB;
-
///
/// 根据主键获取信息
///
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls
index 76fb91c6571d13d8ed884e3a6d7facf63fc22dbf..a66494153794d2e0b0f6a1e44485d237e7605e10 100644
GIT binary patch
delta 173
zcmZpe!`Lu~aYGIZ+l0B5^19rUi&)wi7i|8?qQ}QrGuc5{ezLppdzQ=JPfgftC9;Qy
z(Q)#31?|n>6mCm0wr##-Rl~&SJK5jXn9*o*v+ZxCt6cmHObjdxwG2EAj6irm2*GCp
z${gUHyueP5sX=n{0lP*PZdRaD2B0!l2G+?w&K;XvB$!wN8?^6imT}`@V*I~Z)5DvQ
PjX~T2=&sFGo^31ug#IwT
delta 169
zcmZpe!`Lu~aYGIZTfwJrJui;QMJ#QMC7XY;=h
Mfo|Gd<=Msp0DHGB4*&oF
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx
index 00978fa..0725f3b 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx
@@ -12,7 +12,6 @@
overflow:scroll;
background:#f2f5f7;
color:#362b36;
- ov
}
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
index 5848453..0054d0c 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
@@ -91,8 +91,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index 4a488fd..610e195 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -61,62 +61,61 @@ namespace FineUIPro.Web
{
if (Session["CurrUser"] == null && !Request.Path.Contains("/Login.aspx") && !Request.Path.Contains("DataShow"))
{
- string ticket = Request.Params["ticket"];
- if (!string.IsNullOrEmpty(ticket))
- {
- string jsonCameras = APIGetHttpService.Http("https://cas.china-tcc.com/cas/serviceValidate?service=https://tccsg.cntcc.cn:17001/sggl/indexProject.aspx&ticket=" + ticket);
+ //string ticket = Request.Params["ticket"];
+ //if (!string.IsNullOrEmpty(ticket))
+ //{
+ // string jsonCameras = APIGetHttpService.Http("https://cas.china-tcc.com/cas/serviceValidate?service=https://tccsg.cntcc.cn:17001/sggl/indexProject.aspx&ticket=" + ticket);
- XmlDocument xml = new XmlDocument();
- xml.LoadXml(jsonCameras);
- XmlElement root = xml.DocumentElement;
- XmlNode node = root.ChildNodes[0];//遍历输出.
- if (node.LocalName == "authenticationSuccess")
- {
- string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
- //if ("zyk" == user)
- //{
- // user = "hfnbd";
- //}
- Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
- where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
- select y).FirstOrDefault();
- if (user != null)
- {
- string accValue = HttpUtility.UrlEncode(user);
- FormsAuthentication.SetAuthCookie(accValue, false);
- Page.Session[SessionName.CurrUser] = sysUser;
- string url = "";
- this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
- if (!this.CurrUser.LastIsOffice.HasValue)
- {
- this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
- }
- if (this.CurrUser.LastIsOffice == true)
- {
- this.CurrUser.LoginProjectId = null;
- ////本部菜单
- url = "index.aspx";
- }
- else
- {
- this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
- //// 项目菜单
- url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
- }
- this.SysType = "GONGCHENG";
- Response.Redirect(url);
- }
- else
- {
- Response.Redirect("Login.aspx");
- }
- }
- }
- else
- {
- Response.Redirect("https://cas.china-tcc.com/cas/login?service=https://tccsg.cntcc.cn:17001/sggl/indexProject.aspx");
-
- }
+ // XmlDocument xml = new XmlDocument();
+ // xml.LoadXml(jsonCameras);
+ // XmlElement root = xml.DocumentElement;
+ // XmlNode node = root.ChildNodes[0];//遍历输出.
+ // if (node.LocalName == "authenticationSuccess")
+ // {
+ // string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
+ // //if ("zyk" == user)
+ // //{
+ // // user = "hfnbd";
+ // //}
+ // Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
+ // where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
+ // select y).FirstOrDefault();
+ // if (user != null)
+ // {
+ // string accValue = HttpUtility.UrlEncode(user);
+ // FormsAuthentication.SetAuthCookie(accValue, false);
+ // Page.Session[SessionName.CurrUser] = sysUser;
+ // string url = "";
+ // this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
+ // if (!this.CurrUser.LastIsOffice.HasValue)
+ // {
+ // this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
+ // }
+ // if (this.CurrUser.LastIsOffice == true)
+ // {
+ // this.CurrUser.LoginProjectId = null;
+ // ////本部菜单
+ // url = "index.aspx";
+ // }
+ // else
+ // {
+ // this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
+ // //// 项目菜单
+ // url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
+ // }
+ // this.SysType = "GONGCHENG";
+ // Response.Redirect(url);
+ // }
+ // else
+ // {
+ // Response.Redirect("Login.aspx");
+ // }
+ // }
+ //}
+ //else
+ //{
+ // Response.Redirect("https://cas.china-tcc.com/cas/login?service=https://tccsg.cntcc.cn:17001/sggl/indexProject.aspx");
+ //}
}
var pm = PageManager.Instance;
if (pm != null)