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("删除成功"); }