From 6ceeb30df3145b706e5836926b104ec1f26aec87 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 20 Jul 2023 00:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E9=94=80=E5=94=AE=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/bms/controller/BmsRegionController.java | 2 +- .../modules/bms/service/impl/BmsRegionServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index ddb1cb57..59d44995 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -387,7 +387,7 @@ public class BmsRegionController { boolean result = bmsRegionService.removeById(id); //清空临时表 hisUserSupplierService.cleanTable(); - return R.isTrue(result); + return R.ok(); } } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index f599ef93..cde982b6 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -59,9 +59,9 @@ public class BmsRegionServiceImpl extends ServiceImpl BmsRegion ori = this.getById(param.getId()); param = this.flushSetLevel(param); boolean changePid = !ori.getPid().equals(param.getPid()); - if(changePid){ - Assert.throwEx("当前版本限制上下级变更"); - } +// if(changePid){ +// Assert.throwEx("当前版本限制上下级变更"); +// } boolean b = this.updateById(param); if(!ori.getName().equals(param.getName())||changePid) { BmsRegion parentRegion = this.updatePathByPid(param.getId());