From 02fe8438a02c35074da5aab67dfbaaf82933c259 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 10 Feb 2025 15:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/service/impl/LeaseApplyInfoServiceImpl.java | 2 +-
 .../bonus/material/scrap/controller/ScrapReasonController.java | 2 +-
 .../com/bonus/material/scrap/service/IScrapReasonService.java  | 1 -
 .../resources/mapper/material/purchase/PurchaseBindMapper.xml  | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index e3ec397e..8941fefb 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -417,7 +417,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
      */
     @Override
     public AjaxResult getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo) {
-        if (bmQrcodeInfo.getQrCode() == null) {
+        if (StringUtils.isBlank(bmQrcodeInfo.getQrCode())) {
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "二维码code不能为空");
         }
         List<LeaseOutDetails> recordList = leaseApplyDetailsMapper.getInfoByQrcode(bmQrcodeInfo);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapReasonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapReasonController.java
index f402018e..6807ebe6 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapReasonController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapReasonController.java
@@ -1,4 +1,4 @@
-package com.bonus.material.warehouse.controller;
+package com.bonus.material.scrap.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapReasonService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapReasonService.java
index 203275ab..d2402cc9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapReasonService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapReasonService.java
@@ -1,7 +1,6 @@
 package com.bonus.material.scrap.service;
 
 import com.bonus.material.scrap.domain.ScrapReason;
-import com.bonus.material.warehouse.domain.WhHouseInfo;
 
 import java.util.List;
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
index 035ecca8..a2b5e1be 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
@@ -260,7 +260,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             bm_qrcode_info
         WHERE
-            DATE_FORMAT(create_time, '%Y-%m') = #{genMonth}
+            qr_code IS NOT NULL
+            AND DATE_FORMAT(create_time, '%Y-%m') = #{genMonth}
         ORDER BY
             qr_code DESC
     </select>