From 2482c473d5163737de099ea41728f6e84382b857 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Sat, 13 Apr 2024 16:58:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XzSupplierQualificationApplyServiceImpl.java       | 6 +++++-
 src/main/java/com/zhgd/xmgl/util/EmailUtils.java            | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java
index dc0eaff8f..383aa71cc 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java
@@ -64,6 +64,10 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
     private QueryWrapper<XzSupplierQualificationApply> getQueryWrapper(HashMap<String, Object> paramMap) {
         String alias = "xsqa.";
         QueryWrapper<XzSupplierQualificationApply> queryWrapper = QueryGenerator.initPageQueryWrapper(XzSupplierQualificationApply.class, paramMap, alias);
+        String userId = MapUtils.getString(paramMap, "userId");
+        if (StrUtil.isNotBlank(userId)) {
+            queryWrapper.eq(alias + RefUtil.fieldNameUlc(XzSupplierQualificationApply::getApplyUserId), userId);
+        }
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSupplierQualificationApply::getId));
         return queryWrapper;
     }
@@ -131,7 +135,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
         map.put("userId", userId);
         XzSupplier xzSupplier = xzSupplierService.getXzSupplierByUserId(map);
         if (xzSupplier == null) {
-            throw new OpenAlertException("供应商不存在");
+            throw new OpenAlertException("请先填报基本信息");
         }
         xzSupplier.setId(null);
         XzSupplierRecord supplierRecord = new XzSupplierRecord();
diff --git a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java
index bea0a0a35..2ca720150 100644
--- a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java
+++ b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java
@@ -46,7 +46,6 @@ public class EmailUtils implements EmailService {
      * @param content 内容
      */
     @Override
-    @Async
     public void sendSimpleMail(String to, String subject, String content) {
         log.info("发送邮件，收件人：{}，主题：{}，内容：{}", to, subject, content);
         try {