From 73057d35701d7261d7d0a6bcf26f349c364f965b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 16 Jun 2023 11:47:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=ABbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicProductCategoryController.java | 15 +++++++++++-- .../BasicProductCategoryServiceImpl.java | 21 +++++++++++++++++++ .../impl/BasicProductCategoryService.java | 4 ++++ .../basic/BasicProductCategoryMapper.xml | 2 +- .../basic/BasicProductCategoryRelMapper.xml | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java index 970124695..617256297 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java @@ -137,6 +137,16 @@ public class BasicProductCategoryController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //先判断是否有下级 无下级在判断是否有产品 + boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode()); + if(b){ + return ResultVOUtils.error(555,"此分类下还有子分类,不能删除!"); + } + //判断此分类中是否有产品 + boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode()); + if(checkrel){ + return ResultVOUtils.error(555,"此分类中绑定产品,不能删除!"); + } String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest); @@ -272,8 +282,6 @@ public class BasicProductCategoryController { @GetMapping("/udiwms/basic/product/category/SelcetproductList") public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) { - - List udiRelevanceResponses=null; @@ -325,6 +333,9 @@ public class BasicProductCategoryController { for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) { list.add(udiRelevanceRespons.getId()+""); } + if(!(udiRelevanceResponses != null && udiRelevanceResponses.size()>0)){ + return ResultVOUtils.error(456,"为查询到对应数据!"); + } basicProductTypeRequest.setIds(list); basicProductCategoryService.insertCateRel(basicProductTypeRequest); diff --git a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java index 85755c75b..147239181 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java @@ -187,5 +187,26 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ return basicProductCategoryRelMapper.deleteById(id)>0; } + + @Override + public boolean checkExist(String code) { + List list = basicProductCategoryMapper.selectList(new QueryWrapper().eq("parentCode", code)); + if(list != null && list.size()>0){ + return true; + } + + return false; + } + + @Override + public boolean checkrel(String code) { + + List relList = basicProductCategoryRelMapper.selectList(new QueryWrapper().eq("code", code)); + if(relList != null && relList.size() > 0){ + return true; + } + + return false; + } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java index 1790a78de..d62aa7ef9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java @@ -34,6 +34,10 @@ public interface BasicProductCategoryService { boolean deleterelByid(Integer id); + boolean checkExist(String code); + + boolean checkrel(String code); + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml index b9cb6e927..027fab02b 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml @@ -20,7 +20,7 @@ diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml index 4378d441b..115436333 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml @@ -75,7 +75,7 @@ - + GROUP BY basic_products.nameCode From 628066d7c64d029d313aa8a87d3cc150e9e6361b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 16 Jun 2023 12:59:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/basic/BasicProductCategoryRelMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml index 115436333..284e25759 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml @@ -75,7 +75,7 @@ - GROUP BY basic_products.nameCode + GROUP BY basic_product_category_rel.relId