Merge remote-tracking branch 'origin/dev' into dev

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<UdiRelevanceResponse> 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);
 

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<BasicProductCategory> list = basicProductCategoryMapper.selectList(new QueryWrapper<BasicProductCategory>().eq("parentCode", code));
+            if(list != null && list.size()>0){
+                return true;
+            }
+
+        return false;
+    }
+
+    @Override
+    public boolean checkrel(String code) {
+
+        List<BasicProductCategoryRel> relList = basicProductCategoryRelMapper.selectList(new QueryWrapper<BasicProductCategoryRel>().eq("code", code));
+            if(relList != null && relList.size() > 0){
+                return  true;
+            }
+
+        return false;
+    }
 }
 

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);
+
 
 
 }

src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml

@@ -20,7 +20,7 @@
   </sql>
 
   <select id="getTreeList" resultType="com.glxp.api.res.basic.BasicProductCategoryTypeResponse">
-    SELECT id, code, name as label, parentCode
+    SELECT id, code, name as label, parentCode,remark
     FROM basic_product_category
     ORDER BY id DESC
   </select>

src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml

@@ -75,7 +75,7 @@
           </if>
 
         </where>
-
+     GROUP BY basic_product_category_rel.relId
 
   </select>