From cbe4a0b5f6a5eb03f228dbe8a0542f39770c96e8 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Wed, 1 Jun 2022 14:39:09 +0800
Subject: [PATCH] =?UTF-8?q?bug52732=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryBaseEOController.java          |  4 ++--
 .../impl/DummyInventoryBaseEOServiceImpl.java    | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
index ad69b13f0..3af3f99cb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
@@ -222,13 +222,13 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 			 if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
 				 return Result.OK().success("发布成功");
 			 } else {
-				 return Result.error("Release success!");
+				 return Result.OK().success("Release success!");
 			 }
 		 }else {
 			 if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
 				 return Result.OK().success("撤回成功");
 			 } else {
-				 return Result.error("Withdrawal succeeded!");
+				 return Result.OK().success("Withdrawal succeeded!");
 			 }
 		 }
      }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index badc96a94..75ec018a3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
-import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.domain.service.DomainUserRelService;
@@ -274,11 +272,11 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 if(list.size() != 0){
                     iDummyContentChangeEOService.saveBatch(list);
                 }
-                if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                    throw new JeroBootException("维护清单为空,发布失败");
-                }else{
-                    throw new JeroBootException("The maintenance list is empty, and publishing failed.");
-                }
+//                if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+//                    throw new JeroBootException("维护清单为空,发布失败");
+//                }else{
+//                    throw new JeroBootException("The maintenance list is empty, and publishing failed.");
+//                }
             }else{
                 //1.查询之前保存过的基础数据
                 LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>();
@@ -431,13 +429,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
 
-                    }else {
+                    }/*else {
                         if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
                             throw new JeroBootException("操作成功");
                         } else {
                             throw new JeroBootException("Successful operation.");
                         }
-                    }
+                    }*/
                 }
             }
         }else{