From 740fa31c3bf48695ccc63163278d1e9d020b3c7d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 07 八月 2025 12:45:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 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