From 82645238a5855f6f7b8c397d1f8fa8b4a3155b94 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 14 七月 2021 16:00:18 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/Services/IntentionCustomerService.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 73e8090..7ffaf19 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -95,6 +95,11 @@
                     updateproject.Dianxiaozhuanyuan = intentionCustomer.Dianxiaozhuanyuan;
                     updateproject.Zuijinzhuizongtime = intentionCustomer.Zuijinzhuizongtime;
 
+                    updateproject.Weixin = intentionCustomer.Weixin;
+                    updateproject.Shifoutianjiaweixin = intentionCustomer.Shifoutianjiaweixin;
+                    updateproject.Weixiner = intentionCustomer.Weixiner;
+                    updateproject.Weixintime = intentionCustomer.Weixintime;
+
                 }
 
             _context.SaveChanges();
@@ -227,6 +232,7 @@
                                 
                                     && (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
                                       && (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
+                                       && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null))
                          select new IntentionCustomerDTO
                      {
                          Id = a.Id,
@@ -267,7 +273,10 @@
                          ShrTel = a.ShrTel,
                          ShrAddress = a.ShrAddress,
                          Remark = a.Remark,
-
+                         Weixin = a.Weixin,
+                         Shifoutianjiaweixin = a.Shifoutianjiaweixin,
+                         Weixiner = a.Weixiner,
+                         Weixintime = a.Weixintime,
                          RecStatus = a.RecStatus,
                          Modifier = a.Modifier,
                          Modifytime = a.Modifytime,

--
Gitblit v1.9.1