From fd813c61ccf24cf90fb6106c42679b80db190919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 16 Feb 2026 13:55:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?```=20fix(ticket):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 BooleanUtil 工具类导入用于布尔值判断 - 注入 ITBaseAreaService 服务用于区域信息查询 - 重构用户区域名称获取逻辑，区分用户类型 - 使用 Optional 避免空指针异常 - 修复主用户标识判断条件 ``` --- .../admin/controller/TicketController.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 2225c7fe..f0cecc88 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -2,6 +2,7 @@ package com.nflg.mobilebroken.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import com.itextpdf.text.pdf.BaseFont; import com.nflg.mobilebroken.admin.annotation.ApiMark; @@ -141,6 +142,9 @@ public class TicketController extends ControllerBase { @Resource private ShengWangService shengWangService; + @Resource + private ITBaseAreaService areaService; + /** * 获取问题类型 * @return 问题类型列表 @@ -646,12 +650,17 @@ public class TicketController extends ControllerBase { AdminUser adminUser = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN) ? adminUserService.getById(ticket.getUserId()) : null; AppUser user = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_APP) ? appUserService.getById(ticket.getUserId()) : null; String areaName = ""; - if (Objects.nonNull(user)) - if (user.getIsPrimary()) { - areaName = StrUtil.join(",", customerService.getAreas(Arrays.stream(user.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()))); - } else if (Objects.nonNull(user.getAreaId())) { - areaName = appAreaService.getById(user.getAreaId()).getName(); + if (Objects.nonNull(user)) { + if (user.getType() == 0) { + if (BooleanUtil.isTrue(user.getIsPrimary())) { + areaName = StrUtil.join(",", customerService.getAreas(Arrays.stream(user.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()))); + } else if (Objects.nonNull(user.getAreaId())) { + areaName = appAreaService.getById(user.getAreaId()).getName(); + } + }else { + areaName = Optional.ofNullable(areaService.getById(user.getAreaId())).map(TBaseArea::getAreaName).orElse(""); } + } // TBaseCustomer company = customerService.getById(Integer.valueOf(user.getCompanyId())); DeviceInfoVO device = deviceService.getByDeviceNo(ticket.getDeviceNo()); String warrantyStateDesc = ""; From d631cdd15f06864f2eb5218e77a59145c64afc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 25 Feb 2026 17:21:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20bug-1327=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9A=84=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=90=8E=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E8=83=BD?= =?UTF-8?q?=E5=90=A6=E4=BC=98=E5=8C=96=E4=B8=BA=E4=B8=8E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=80=E8=87=B4=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/ProductModelController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index cb250503..75d66ce4 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -558,7 +558,8 @@ public class ProductModelController extends ControllerBase { if (CollectionUtil.isNotEmpty(paramsItems)) { AtomicInteger rowIndex = new AtomicInteger(4); List cnItems = paramsItems.stream().filter(item -> StrUtil.equals(item.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)).collect(Collectors.toList()); - Map> itemMap = cnItems.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName)); + cnItems.sort(Comparator.comparing(ProductModelParamsItem::getBatchNumber)); + Map> itemMap = cnItems.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName, LinkedHashMap::new, Collectors.toList())); AtomicInteger row = new AtomicInteger(rowIndex.get()); itemMap.forEach((indexName, itemData) -> { int itemSize = itemData.size();