From d6a55a07304d848dd984cfb5d25a9e97fe269871 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Thu, 3 Jul 2025 19:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/controller/SynchronousController.java | 9 +++++++-- .../controller/CoscoCategoryController.java | 6 +++++- .../controller/CoscoCategoryLibraryController.java | 2 +- .../impl/CoscoCategoryLibraryContainServiceImpl.java | 4 +--- .../service/impl/CoscoCategoryLibraryServiceImpl.java | 2 +- .../service/impl/CoscoCategoryServiceImpl.java | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java index 1c5aca5..1453457 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary; @@ -57,8 +58,12 @@ public class SynchronousController { */ @PostMapping("/categroyLibraryApproval") public BaseResponse categroyLibraryApproval(@RequestBody CoscoCategoryLibrary coscoCategoryLibrary) { - return BaseResponse.success(coscoCategoryLibraryService - .synchronousCategroyLibraryApproval(coscoCategoryLibrary)); + int i = coscoCategoryLibraryService + .synchronousCategroyLibraryApproval(coscoCategoryLibrary); + if(i<=0){ + return BaseResponse.fail(ErrorMessageConstant.NO_APPROVAL_ORDER_FOUND); + } + return BaseResponse.success(); } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java index b00def9..dc3d376 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java @@ -74,7 +74,11 @@ public class CoscoCategoryController extends BaseController { if(coscoCategory.getParentId()==null){ return BaseResponse.fail(ErrorMessageConstant.PLEASE_SELECT_SUPERIOR_CATEGORY); } - return BaseResponse.success(coscoCategoryService.insertCoscoCategory(coscoCategory)); + int i = coscoCategoryService.insertCoscoCategory(coscoCategory); + if (i<=0) { + return BaseResponse.fail(ErrorMessageConstant.ENABLE_DISABLE_TEMPLATE_NOT_MODIFY); + } + return BaseResponse.success(); } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java index a527b2e..ae2e86d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java @@ -118,7 +118,7 @@ public class CoscoCategoryLibraryController extends BaseController { public BaseResponse approval(@RequestBody CoscoCategoryVO coscoCategoryVO) { CoscoCategoryLibrary coscoCategoryLibrary = coscoCategoryLibraryService.selectCoscoCategoryLibraryById(coscoCategoryVO.getId()); if(coscoCategoryLibrary.getDeptId()==null){ - throw new RuntimeException("请选择负责部门"); + return BaseResponse.fail("请选择负责部门"); } return BaseResponse.success(coscoCategoryLibraryService.approval(coscoCategoryVO)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java index c470ddf..8e9f9fa 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java @@ -148,9 +148,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl coscoCategoryLibraryContain) { - coscoCategoryLibraryContain.forEach(co->{ - coscoCategoryLibraryContainMapper.updateLockType(co); - }); + coscoCategoryLibraryContain.forEach(co-> coscoCategoryLibraryContainMapper.updateLockType(co)); return 1; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index a91e724..546b1bd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -247,7 +247,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl