From 9ab109b9ee96e7ff2bf2b935a044aee5842a3ddc Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期日, 28 九月 2025 10:08:09 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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..cd7d2f9 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 @@ -1,5 +1,6 @@ package com.doumee.service.business.impl; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.service.business.third.model.LoginUserInfo; @@ -38,6 +39,8 @@ public class CategoryServiceImpl implements CategoryService { @Autowired + private SystemDictDataBiz systemDictDataBiz; + @Autowired private CategoryMapper categoryMapper; @Override @@ -58,6 +61,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()); @@ -154,20 +158,28 @@ IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<Category> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); + String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + + systemDictDataBiz.queryByCode(Constants.FTP,Constants.BANNER_IMG).getCode(); + 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( categoryList.stream().filter(i->Constants.equalsInteger(i.getParentId(),category.getId())).collect(Collectors.toList()) ); + if(StringUtils.isNotBlank(category.getImgurl())){ + category.setImgurlFull(prefixUrl + category.getImgurl()); + } } return categoryPageData; @@ -180,6 +192,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 +208,8 @@ category.setGroupName( category.getParentName()+"/"+category.getName()); data.add(category); } + }else{ + data.add(category); } } } -- Gitblit v1.9.3