From a6f82a7812384572447d6af13fb214fbf0887b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 30 May 2023 18:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AE=BE=E7=BD=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/inv/impl/InvRemindSetServiceImpl.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
index 4acac556c..616722fce 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
@@ -52,7 +52,7 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
         if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) {
             PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit());
         }
-        if(StrUtil.isNotBlank(filterInvRemindSetRequest.getProductName())){
+        if (StrUtil.isNotBlank(filterInvRemindSetRequest.getProductName())) {
             filterInvRemindSetRequest.setRelIds(udiRelevanceDao.selectRelIdByName(filterInvRemindSetRequest.getProductName()));
         }
 
@@ -233,13 +233,13 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
             if (null == udiRelevanceEntity) {
                 invRemindSetEntity.setStatus(0);
             } else {
-                if (invRemindSetEntity.getLowStock() && null == udiRelevanceEntity.getLowStockNum()) {
+                if (!invRemindSetEntity.getLowStock() && null == udiRelevanceEntity.getLowStockNum() &&
+                        !invRemindSetEntity.getOverStock() && null == udiRelevanceEntity.getOverStockNum() &&
+                        !invRemindSetEntity.getRecentDate() && null == udiRelevanceEntity.getRecentDateTime() &&
+                        !invRemindSetEntity.getExpireDate() && !invRemindSetEntity.getLackStock()) {
                     invRemindSetEntity.setStatus(0);
-                } else if (invRemindSetEntity.getOverStock() && null == udiRelevanceEntity.getOverStockNum()) {
-                    invRemindSetEntity.setStatus(0);
-                } else if (invRemindSetEntity.getRecentDate() && null == udiRelevanceEntity.getRecentDateTime()) {
-                    invRemindSetEntity.setStatus(0);
-                } else {
+                } else if (invRemindSetEntity.getLowStock() || invRemindSetEntity.getLackStock() ||
+                        invRemindSetEntity.getOverStock() || invRemindSetEntity.getRecentDate() || invRemindSetEntity.getExpireDate()) {
                     invRemindSetEntity.setStatus(1);
                 }
             }