From ea286c51aa0ec6f8037f4b81f924a6b4db2623a3 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Sat, 29 Mar 2025 10:10:11 +0800
Subject: [PATCH] =?UTF-8?q?20250329=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/WorkBench.aspx.cs | 39 +++++++++++++++-------------
SGGL/WebAPI/WebAPI.csproj.user | 2 +-
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/SGGL/FineUIPro.Web/WorkBench.aspx.cs b/SGGL/FineUIPro.Web/WorkBench.aspx.cs
index 9c880371..4208e0ae 100644
--- a/SGGL/FineUIPro.Web/WorkBench.aspx.cs
+++ b/SGGL/FineUIPro.Web/WorkBench.aspx.cs
@@ -169,10 +169,10 @@ namespace FineUIPro.Web
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
- (case when AttachFile.AttachUrl is not null
+ (case when AttachFile.AttachUrl is null then '../../res/images/16.png' else
+ (case when AttachFile.AttachUrl is not null and AttachFile.AttachUrl like '%,%'
then '../../' + SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
- else '../../res/images/16.png' end )
- as AttachUrl
+ else '../../'+AttachFile.AttachUrl end ) end)as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
@@ -189,8 +189,9 @@ namespace FineUIPro.Web
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
for (int i = 0; i < tb.Rows.Count; i++)
- {
+ {
returnDbHtml += "
" + tb.Rows[i][2].ToString() + "
进入项目
";
+ //returnDbHtml += "abc";
}
}
else
@@ -208,10 +209,10 @@ namespace FineUIPro.Web
if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
- (case when AttachFile.AttachUrl is not null
- then '../../'+ SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
- else '../../res/images/16.png' end )
- as AttachUrl
+ (case when AttachFile.AttachUrl is null then '../../res/images/16.png' else
+ (case when AttachFile.AttachUrl is not null and AttachFile.AttachUrl like '%,%'
+ then '../../' + SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
+ else '../../'+AttachFile.AttachUrl end ) end)as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
@@ -235,9 +236,10 @@ namespace FineUIPro.Web
else
{
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName,p.ProjectState
- (case when AttachFile.AttachUrl is not null
- then '../../'+SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
- else '../../res/images/16.png' end )as AttachUrl
+ (case when AttachFile.AttachUrl is null then '../../res/images/16.png' else
+ (case when AttachFile.AttachUrl is not null and AttachFile.AttachUrl like '%,%'
+ then '../../' + SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
+ else '../../'+AttachFile.AttachUrl end ) end)as AttachUrl
from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
left join AttachFile on AttachFile.ToKeyId=p.ProjectId
@@ -267,10 +269,10 @@ namespace FineUIPro.Web
if (getRoleP != null)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
- (case when AttachFile.AttachUrl is not null
- then '../../'+SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
- else '../../res/images/16.png' end )
- as AttachUrl
+ (case when AttachFile.AttachUrl is null then '../../res/images/16.png' else
+ (case when AttachFile.AttachUrl is not null and AttachFile.AttachUrl like '%,%'
+ then '../../' + SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
+ else '../../'+AttachFile.AttachUrl end ) end)as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
@@ -294,9 +296,10 @@ namespace FineUIPro.Web
else
{
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName,p.ProjectState,
- (case when AttachFile.AttachUrl is not null
- then '../../'+SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
- else '../../res/images/16.png' end ) as AttachUrl
+ (case when AttachFile.AttachUrl is null then '../../res/images/16.png' else
+ (case when AttachFile.AttachUrl is not null and AttachFile.AttachUrl like '%,%'
+ then '../../' + SUBSTRING(AttachFile.AttachUrl, 1 , CHARINDEX(',',AttachFile.AttachUrl)-1)
+ else '../../'+AttachFile.AttachUrl end ) end)as AttachUrl
from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
left join AttachFile on AttachFile.ToKeyId=p.ProjectId
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 285eec39..556827c1 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true