From 9a2e03aeaeec812a24c849fb182be4125aa87000 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 2 Mar 2022 15:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4=EF=BC=8C=E5=86=85=E9=83=A8?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/basic/BussinessTypeController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index e06e0bf..ded8950 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -14,6 +14,7 @@ import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.util.CustomUtil; @@ -46,6 +47,8 @@ public class BussinessTypeController { @Resource private BussinessTypeService bussinessTypeService; @Resource + private BussinessLocalTypeService bussinessLocalTypeService; + @Resource private AuthAdminService authAdminService; @Resource private OrderService orderService; @@ -107,11 +110,11 @@ public class BussinessTypeController { if (orderEntity != null) { return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！"); } - if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) { + + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); + if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) { return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！"); } - - bussinessTypeService.deleteById(id); return ResultVOUtils.success("删除成功"); }