From ffcef3d87676ebaf7f22413711b57bbe0404b3f2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 八月 2025 16:17:21 +0800
Subject: [PATCH] 冲突分支合并 2025-08-12 16:17
---
WebAPI/Controllers/ReportPlatFormController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index af42dcf..2daaede 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -332,7 +332,7 @@
ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 鐢ㄦ埛鍚嶇О='" + user+ "' order by 鎸夐挳鎺掑簭", "h_v_Gy_UserButton");
- if (ds==null && ds.Tables[0].Rows.Count <= 0)
+ if (ds.Tables[0]==null || ds.Tables[0].Rows.Count <1)
{
ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 鐢ㄦ埛鍚嶇О='admin' order by 鎸夐挳鎺掑簭", "h_v_Gy_UserButton");
}
--
Gitblit v1.9.1