From 59a88af52ba5e3025197de6a8b97f0e227c94929 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 25 Mar 2025 17:08:28 +0800 Subject: [PATCH] 20240325 --- SGGL/FineUIPro.Web/SelectProject.aspx.cs | 6 +++--- SGGL/FineUIPro.Web/WorkBench.aspx.cs | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SGGL/FineUIPro.Web/SelectProject.aspx.cs b/SGGL/FineUIPro.Web/SelectProject.aspx.cs index 3c9e03ce..00aa9952 100644 --- a/SGGL/FineUIPro.Web/SelectProject.aspx.cs +++ b/SGGL/FineUIPro.Web/SelectProject.aspx.cs @@ -88,7 +88,7 @@ namespace FineUIPro.Web { if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sedinId) { - string strSql = @"select Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectState，ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2 from Base_Project as Project" + string strSql = @"select Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectState,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2 from Base_Project as Project" + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId" + @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' " + @" WHERE 1=1"; @@ -132,7 +132,7 @@ namespace FineUIPro.Web //五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的 if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC) { - string strSql = @"select Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectState，ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2 from Base_Project as Project" + string strSql = @"select Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectState,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2 from Base_Project as Project" + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId" + @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' " + @" WHERE 1=1"; @@ -168,7 +168,7 @@ namespace FineUIPro.Web string strSql = @"select distinct p.ProjectId,p.ProjectCode,p.ProjectName from Base_Project p left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId LEFT JOIN Base_ProjectType AS ProjectType ON p.ProjectType =ProjectType.ProjectTypeId - LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId=@groupId + LEFT JOIN Sys_Const AS sysConst ON p.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId=@groupId where ((pu.UserId=@userId and pu.IsPost='true') or p.UnitId=@unitId) and p.ProjectState = @state" + @" WHERE 1=1"; diff --git a/SGGL/FineUIPro.Web/WorkBench.aspx.cs b/SGGL/FineUIPro.Web/WorkBench.aspx.cs index d45bdd82..209c6375 100644 --- a/SGGL/FineUIPro.Web/WorkBench.aspx.cs +++ b/SGGL/FineUIPro.Web/WorkBench.aspx.cs @@ -65,7 +65,7 @@ namespace FineUIPro.Web if (user != null) { this.lName.Text = user.UserName; - this.lblName.Text = Resources.Lan.Welcome + "，" + user.UserName; + this.lblName.Text = "欢迎回来，" + user.UserName; this.lAccount.Text = user.Account; this.lUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(user.UnitId); this.lEmail.Text = user.Email; diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 556827c1..285eec39 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true