From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java index 8ee9dd7..e357e36 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java +++ b/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()); @@ -156,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( @@ -180,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){ @@ -192,6 +199,8 @@ category.setGroupName( category.getParentName()+"/"+category.getName()); data.add(category); } + }else{ + data.add(category); } } } -- Gitblit v1.9.3