From 246e93fd519dadbe3127b6add16ed0e473fccab8 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 08 七月 2025 13:08:58 +0800
Subject: [PATCH] 首检修改

---
 MES.Service/service/QC/SJService.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index db188ef..50e6160 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -40,23 +40,23 @@
 
         string[]? lineNo = null;
 
-        if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
-            lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
+        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
 
         var data = db.Queryable<SJPageResult>()
-            .WhereIF(lineNo != null && lineNo.Length > 0,
-                a => lineNo.Contains(a.line))
+            //.WhereIF(lineNo != null && lineNo.Length > 0,
+            //    a => lineNo.Contains(a.line))
             .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
             .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
                 a => a.BillNo == queryObj.BillNo)
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                 "鏈畬鎴�".Equals(queryObj.Result),
-                a => a.Result == queryObj.Result)
+                a => a.Remarks == queryObj.Result)
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                 !"鏈畬鎴�".Equals(queryObj.Result),
-                a => a.Result != "鏈畬鎴�")
+                a => a.Remarks != "鏈畬鎴�")
             .OrderBy(a => a.BillNo, OrderByType.Desc)
             .ToPageList(queryObj.PageIndex, queryObj.Limit);
 

--
Gitblit v1.9.3