From a50e2a5d668585791d2b5fbb09b11bf48d533287 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:20:31 +0800
Subject: [PATCH] =?UTF-8?q?2024.12.11=20=E5=AE=A1=E6=89=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthHistServiceImpl.java     |  5 +-
 .../inquiry/InquiryApplicationMapper.xml      | 75 ++++++++++---------
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
index 5071b5fa..c159feba 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
@@ -107,7 +107,7 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
                 fromName = "报价单";
                 s.append("<li>有新的报价单待审批，请及时处理！报价单号:").append(Link).append("</li>");
             } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) {
-                Link = "<a href='http://172.26.68.17:9001/#/inquiry-inquiryApplication?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
+                Link = "<a href='http://172.26.68.17:9001/#/auth-authInquiry?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
                 emailAddress.get(0).getOrderRef1() + "</a>";
                 fromName = "询价申请单";
                 s.append("<li>有新的询价申请单待审批，请及时处理！询价申请单号:").append(Link).append("</li>");
@@ -138,6 +138,9 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
 
             String emailAddresss = "";
             for (AuthHistData address : emailAddress) {
+                if (address.getEmail() == null || address.getEmail().equals("")) {
+                    continue;
+                }
                 emailAddresss += address.getEmail() + ";";
             }
 
diff --git a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
index adca5e06..98de2300 100644
--- a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
+++ b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
@@ -16,41 +16,46 @@
         FROM
             plm_rfq_header
         <where>
-            <if test="query.buNo != null and query.buNo != ''">
-                AND bu_no = #{query.buNo}
-            </if>
-            <if test="query.rfqNo != null and query.rfqNo != ''">
-                AND rfq_no like #{query.rfqNo}
-            </if>
-            <if test="query.customerNo != null and query.customerNo != ''">
-                AND customer_no like #{query.customerNo}
-            </if>
-            <if test="query.customerDesc != null and query.customerDesc != ''">
-                AND dbo.plm_get_customer_desc ( site, customer_no ) like #{query.customerDesc}
-            </if>
-            <if test="query.requesterName != null and query.requesterName != ''">
-                AND dbo.get_requester_name(site,requester) like #{query.requesterName}
-            </if>
-            <if test="query.quoterName != null and query.quoterName != ''">
-                AND dbo.get_quoter_name(site,quoter) like #{query.quoterName}
-            </if>
-            <if test="query.priorityLevel != null and query.priorityLevel != ''">
-                AND priority_level = #{query.priorityLevel}
-            </if>
-            <if test="query.status != null and query.status != ''">
-                AND status = #{query.status}
-            </if>
-            <if test="query.requestStartDate != null">
-                AND request_date >= #{query.requestStartDate}
-            </if>
-            <if test="query.requestEndDate != null">
-                AND #{query.requestEndDate} >= request_date
-            </if>
-            <if test="query.requiredCompletionStartDate != null">
-                AND required_completion_date >= #{query.requiredCompletionStartDate}
-            </if>
-            <if test="query.requiredCompletionEndDate != null">
-                AND #{query.requiredCompletionEndDate} >= required_completion_date
+            <if test="query.id != null">
+                AND id = #{query.id}
+            </if>
+            <if test="query.id == null">
+                <if test="query.buNo != null and query.buNo != ''">
+                    AND bu_no = #{query.buNo}
+                </if>
+                <if test="query.rfqNo != null and query.rfqNo != ''">
+                    AND rfq_no like #{query.rfqNo}
+                </if>
+                <if test="query.customerNo != null and query.customerNo != ''">
+                    AND customer_no like #{query.customerNo}
+                </if>
+                <if test="query.customerDesc != null and query.customerDesc != ''">
+                    AND dbo.plm_get_customer_desc ( site, customer_no ) like #{query.customerDesc}
+                </if>
+                <if test="query.requesterName != null and query.requesterName != ''">
+                    AND dbo.get_requester_name(site,requester) like #{query.requesterName}
+                </if>
+                <if test="query.quoterName != null and query.quoterName != ''">
+                    AND dbo.get_quoter_name(site,quoter) like #{query.quoterName}
+                </if>
+                <if test="query.priorityLevel != null and query.priorityLevel != ''">
+                    AND priority_level = #{query.priorityLevel}
+                </if>
+                <if test="query.status != null and query.status != ''">
+                    AND status = #{query.status}
+                </if>
+                <if test="query.requestStartDate != null">
+                    AND request_date >= #{query.requestStartDate}
+                </if>
+                <if test="query.requestEndDate != null">
+                    AND #{query.requestEndDate} >= request_date
+                </if>
+                <if test="query.requiredCompletionStartDate != null">
+                    AND required_completion_date >= #{query.requiredCompletionStartDate}
+                </if>
+                <if test="query.requiredCompletionEndDate != null">
+                    AND #{query.requiredCompletionEndDate} >= required_completion_date
+                </if>
             </if>
         </where>
     </select>