From b0c19dd2793b5ada90b303b7ec23a670cdbf48f6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 11 二月 2022 14:52:52 +0800
Subject: [PATCH] 根据删除的知识点查询

---
 zhengcaioa/Services/ExpertTestTopicService.cs |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index 2b69280..847b3db 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -186,8 +186,7 @@
             var listCode = (from a in _context.SysCodeDtls
                             join b in _context.SysCodes
                             on a.CodeId equals b.Id
-                            where a.RecStatus == "A"
-                                          && b.RecStatus == "A"
+                            where  b.RecStatus == "A"
                             select new CodeDataEntity()
                             {
                                 CodeId = b.Id,
@@ -281,7 +280,7 @@
 
                                && (string.IsNullOrWhiteSpace(searchEntity.Falv) || lll.Falv == searchEntity.Falv.Trim())
 
-
+                                && (string.IsNullOrWhiteSpace(searchEntity.shanchuzhishitype) || a.Zhishitype == searchEntity.shanchuzhishitype.Trim()) 
 
 
                          select  new ExpertTestTopicDTO
@@ -837,8 +836,8 @@
 
                             join f in listCode.Where(x => x.CodeTable == "expert_test_topic" && x.CodeField == "zhishitype")
                        on a.Zhishitype equals f.CodeSn
-                       into fsssss
-                            from fff in fsssss.DefaultIfEmpty()
+                       //into fsssss
+                       //     from fff in fsssss.DefaultIfEmpty()
 
 
                             where a.RecStatus == "A"
@@ -850,7 +849,7 @@
                                 Topictype = a.Topictype,
                                 TopictypeName = eee.Comments,
                                 Zhishitype = a.Zhishitype,
-                                ZhishitypeName = fff.Comments,
+                                ZhishitypeName = f.Comments,
                                 Fenshu = a.Fenshu ?? 0,
                                 Fenzhi = a.Fenzhi??0,
                                 FenshuName = (a.Fenshu ?? 0).ToString("0.##"),

--
Gitblit v1.9.1