From 83b0db735a2726ae0c8e9fe08ae5bcfef8ec2b27 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 19 May 2025 13:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterialCategoryController.java | 4 ++++ .../ConfigMaterialCategoryServiceImpl.java | 24 ++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java index d8670da..edf8292 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java @@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -83,6 +85,8 @@ public class ConfigMaterialCategoryController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configMaterialCategory, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getCategoryId()),"category_id",configMaterialCategory.getCategoryId()); + queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getTypeId()),"type_id",configMaterialCategory.getTypeId()); Page page = new Page(pageNo, pageSize); IPage pageList = configMaterialCategoryService.selectMaterialList(page, queryWrapper); return Result.OK(pageList); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index ebcadd3..befe81a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -37,19 +37,21 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl selectMaterialList(Page page, QueryWrapper queryWrapper) { IPage pageList = baseMapper.selectMaterialList(page,queryWrapper); List list = pageList.getRecords(); - //按照list 的categoryId字段获取相同数据开始和结束标记 - String categoryId = list.get(0).getCategoryId(); - int outerStart = 0; // 一级分组起始索引 - for (int i = 0; i < list.size(); i++) { - ConfigMaterialCategory configMaterialCategory = list.get(i); - // 当遇到不同的categoryId时处理当前分组 - if (!configMaterialCategory.getCategoryId().equals(categoryId)) { - processAllGroups(list, outerStart, i - 1); // 处理完整个一级分组 - outerStart = i; // 重置一级起始位置 - categoryId = configMaterialCategory.getCategoryId(); + if(list.size()>0){ + //按照list 的categoryId字段获取相同数据开始和结束标记 + String categoryId = list.get(0).getCategoryId(); + int outerStart = 0; // 一级分组起始索引 + for (int i = 0; i < list.size(); i++) { + ConfigMaterialCategory configMaterialCategory = list.get(i); + // 当遇到不同的categoryId时处理当前分组 + if (!configMaterialCategory.getCategoryId().equals(categoryId)) { + processAllGroups(list, outerStart, i - 1); // 处理完整个一级分组 + outerStart = i; // 重置一级起始位置 + categoryId = configMaterialCategory.getCategoryId(); + } } + processAllGroups(list, outerStart, list.size() - 1); // 处理最后一组 } - processAllGroups(list, outerStart, list.size() - 1); // 处理最后一组 return pageList; }