Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java

@@ -58,6 +58,7 @@
        insert.setRemark(category.getRemark());
        insert.setStatus(Constants.ZERO);
        insert.setSortnum(category.getSortnum());
        insert.setBizType(category.getBizType());
        insert.setImgurl(category.getImgurl());
        insert.setType(category.getType());
        insert.setParentId(category.getParentId());
@@ -105,6 +106,7 @@
            //清空其他该bizType属性,只保留当前记录唯一有效
            categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
                    .set(Category::getBizType,null)
                    .eq(Category::getBizType,category.getBizType())
                    .ne(Category::getId,category.getId())
            );
        }
@@ -155,13 +157,15 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                .isNull(Category::getParentId);
                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Category::getName,pageWrap.getModel().getName())
                .isNull(Category::getParentId)
                .orderByDesc(Category::getSortnum);
        PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
        //查询所有二级数据
        List<Category> categoryList = categoryMapper.selectList(
                new QueryWrapper<Category>().lambda()
                        .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId));
                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId).orderByDesc(Category::getSortnum));

        for (Category category:categoryPageData.getRecords()) {
            category.setChildCategoryList(
@@ -179,6 +183,10 @@
    }
    @Override
    public  List<Category> findChileList(Category model) {
        if(Objects.isNull(model)){
            model = new Category();
        }
        model.setIsdeleted(Constants.ZERO);
        List<Category> list =findList(model);
        List<Category> data = new ArrayList<>();
        if(list!=null){
@@ -191,6 +199,8 @@
                        category.setGroupName( category.getParentName()+"/"+category.getName());
                        data.add(category);
                    }
                }else{
                    data.add(category);
                }
            }
        }