From a8ff7ccee647186b576b348223b7fd9a575de9ce Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Tue, 2 Jul 2024 14:56:14 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/impl/RecycleBucketServiceImpl.java     | 4 ++--
 .../java/jnpf/service/impl/RecycleCameraServiceImpl.java     | 3 ++-
 .../java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java | 4 +++-
 .../jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java   | 4 +++-
 .../jnpf/service/impl/RecycleDeviceConfigServiceImpl.java    | 4 +++-
 .../java/jnpf/service/impl/RecycleDeviceServiceImpl.java     | 5 ++++-
 .../src/main/java/jnpf/service/impl/SimCardServiceImpl.java  | 3 ++-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java
index 23bbf46..f8a047b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java
@@ -269,7 +269,7 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         if (!userProvider.get().getIsAdministrator()) {
             recycleBucketQueryWrapper.lambda().eq(RecycleBucketEntity::getCompanyId, userProvider.get().getOrganizeId());
         }
-
+        recycleBucketQueryWrapper.lambda().isNull(RecycleBucketEntity::getDeleteMark);
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleBucketEntity> page = new Page<>(recycleBucketPagination.getCurrentPage(), recycleBucketPagination.getPageSize());
@@ -304,7 +304,7 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleBucketEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark("1");
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java
index 964098e..8b58764 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java
@@ -254,6 +254,7 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
         if (!userProvider.get().getIsAdministrator()) {
             recycleCameraQueryWrapper.lambda().eq(RecycleCameraEntity::getCompanyId, userProvider.get().getOrganizeId());
         }
+        recycleCameraQueryWrapper.lambda().isNull(RecycleCameraEntity::getDeleteMark);
 
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
@@ -289,7 +290,7 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleCameraEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark("1");
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
index ffbf2b6..e4b442e 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
@@ -242,6 +242,8 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
             recycleCleanOrderQueryWrapper.lambda().eq(RecycleCleanOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
         }
 
+        recycleCleanOrderQueryWrapper.lambda().isNull(RecycleCleanOrderEntity::getDeleteMark);
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleCleanOrderEntity> page = new Page<>(recycleCleanOrderPagination.getCurrentPage(), recycleCleanOrderPagination.getPageSize());
@@ -276,7 +278,7 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleCleanOrderEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark("1");
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
index aa12496..18ef3cb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
@@ -388,6 +388,8 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
             recycleDeliveryOrderQueryWrapper.lambda().eq(RecycleDeliveryOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
         }
 
+        recycleDeliveryOrderQueryWrapper.lambda().isNull(RecycleDeliveryOrderEntity::getDeleteMark);
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleDeliveryOrderEntity> page = new Page<>(recycleDeliveryOrderPagination.getCurrentPage(), recycleDeliveryOrderPagination.getPageSize());
@@ -422,7 +424,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleDeliveryOrderEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark("1");
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
index 0aad2d6..33f09fd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
@@ -234,6 +234,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
             }
         }
 
+        recycleDeviceConfigQueryWrapper.lambda().isNull(RecycleDeviceConfigEntity::getDeleteMark);
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleDeviceConfigEntity> page = new Page<>(recycleDeviceConfigPagination.getCurrentPage(), recycleDeviceConfigPagination.getPageSize());
@@ -273,7 +275,7 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleDeviceConfigEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark("1");
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java
index 01ecb50..3d40d92 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.base.UserInfo;
 import jnpf.base.model.ColumnDataModel;
 import jnpf.database.model.superQuery.SuperJsonModel;
+import jnpf.entity.RecycleDeliveryOrderEntity;
 import jnpf.entity.RecycleDeviceEntity;
 import jnpf.mapper.RecycleDeviceMapper;
 import jnpf.model.QueryModel;
@@ -323,6 +324,8 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
             recycleDeviceQueryWrapper.lambda().eq(RecycleDeviceEntity::getBeLongCompanyId, userProvider.get().getOrganizeId());
         }
 
+        recycleDeviceQueryWrapper.lambda().isNull(RecycleDeviceEntity::getDeleteMark);
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleDeviceEntity> page = new Page<>(recycleDevicePagination.getCurrentPage(), recycleDevicePagination.getPageSize());
@@ -369,7 +372,7 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(RecycleDeviceEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark(1);
             this.saveOrUpdate(entity);
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java
index f444194..b946c22 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java
@@ -288,6 +288,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
             simCardQueryWrapper.lambda().eq(SimCardEntity::getCompanyId, userProvider.get().getOrganizeId());
         }
 
+        simCardQueryWrapper.lambda().isNull(SimCardEntity::getDeleteMark);
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<SimCardEntity> page = new Page<>(simCardPagination.getCurrentPage(), simCardPagination.getPageSize());
@@ -322,7 +323,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(SimCardEntity entity) {
-        if (StringUtils.isBlank(entity.getId())) {
+        if (StringUtils.isNoneBlank(entity.getId())) {
             entity.setDeleteMark(1);
             this.saveOrUpdate(entity);
         }