2024.12.11 审批优化

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() + ";";
             }
 

src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml

@@ -16,6 +16,10 @@
         FROM
             plm_rfq_header
         <where>
+            <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>
@@ -52,6 +56,7 @@
                 <if test="query.requiredCompletionEndDate != null">
                     AND #{query.requiredCompletionEndDate} >= required_completion_date
                 </if>
+            </if>
         </where>
     </select>
     <select id="searchUserAuthInquiryApplicationInfo" resultType="com.xujie.sys.modules.inquiry.data.InquiryApplicationData">