From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
index 00aa8b5..6214f46 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
@@ -104,7 +104,7 @@
     public R deleteOneClinkSyncing(Integer syncingId) {
         //删除
         OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
-        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
             return R.ok();
         }
         oneClinkSyncing.setDelFlag(1);
@@ -118,7 +118,7 @@
     public R executeOneClinkSyncing(Integer syncingId) {
         //根据oneClinkSyncing,修改门店信息
         OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
-        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
             return R.fail("该一键同步不存在");
         }
         if (oneClinkSyncing.getShopIds() == null || oneClinkSyncing.getShopIds().trim().isEmpty()) {

--
Gitblit v1.7.1