From 2c5ffd64a5a5cd1c4b1972299f09a37953a1aa35 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Tue, 24 Nov 2020 11:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=91=20https://www.tapd.cn/39598945/pron?=
 =?UTF-8?q?g/stories/view/1139598945001000131?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs | 5 ++++-
 Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs b/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs
index 23b2f0f..5045d9a 100644
--- a/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs
+++ b/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs
@@ -223,7 +223,10 @@ namespace Hncore.Pass.BaseInfo.Controllers
                     new ExcelTitle { Property = "UserName", Title = "用户" },
                     new ExcelTitle { Property = "OperateUserName", Title = "操作人员" },
                     new ExcelTitle { Property = "ScoreTypeName", Title = "资金项目" },
-                    new ExcelTitle { Property = "ScoreValue", Title = "金额" }                 
+                    new ExcelTitle { Property = "ScoreValue", Title = "金额" },                 
+                    new ExcelTitle { Property = "Remark", Title = "备注" },                 
+                    new ExcelTitle { Property = "RestAmount1", Title = "操作前金额" },                 
+                    new ExcelTitle { Property = "RestAmount2", Title = "操作后金额" }                 
                 };
             var fileBytes = ExcelHelper.ExportListToExcel(data, title);
 
diff --git a/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs b/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs
index 522de5a..ec5eceb 100644
--- a/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs
+++ b/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs
@@ -39,7 +39,7 @@ namespace Hncore.Pass.BaseInfo.Service
 
             if (request.KeyWord.Has())
             {
-                exp = exp.And(m => m.UserName.Contains(request.KeyWord) || m.OperateUserName.Contains(request.KeyWord));
+                exp = exp.And(m => m.UserName.Contains(request.KeyWord) || m.OperateUserName.Contains(request.KeyWord) || m.ScoreTypeName.Contains(request.KeyWord) || m.Remark.Contains(request.KeyWord));
             }
             if (request.Type.HasValue&&request.Type>0)
             {