From d66cbfe2dec69d08f9905b320851eb11d09567bc Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期三, 10 十一月 2021 16:14:55 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/Services/ExpertTestTopicService.cs |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index 57fa6ea..1ce29f8 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -121,7 +121,7 @@
                 {
                     for (int i = 0; i < Falv.Length; i++)
                     {
-                        if (!string.IsNullOrEmpty(dto.Falv[i]))
+                        if (!string.IsNullOrEmpty(dto.Falv[i]) || !string.IsNullOrEmpty(dto.Fatiao[i]) || !string.IsNullOrEmpty(dto.Fatiaomingxi[i]))
                         {
                             ExpertTestTopicjiexi expertTestTopicjiexi = new ExpertTestTopicjiexi();
 
@@ -327,7 +327,16 @@
 
                 foreach (var quer in querydel)
                 {
-                    lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+                    if (lian.Topictype != "03")
+                    {
+                        lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+                    }
+                 
+                    if(quer.Shifouzhengqu == "A")
+                    {
+                        lian.Anwsers += quer.Anwserno ;
+                    }
+                    
                 }
             }
 
@@ -344,7 +353,15 @@
 
                     jiexi +=(falv!=null? "銆�" + falv.Comments + "銆�" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
                 }
-                lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+                if (string.IsNullOrEmpty(lian.Jiexi))
+                {
+                    lian.Jiexi = jiexi;
+                }
+                else
+                {
+                    lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+                }
+               
             }
 
             data.LoadData(searchEntity, lianlist);

--
Gitblit v1.9.1