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<ProductModelParamsItem> cnItems = paramsItems.stream().filter(item -> StrUtil.equals(item.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)).collect(Collectors.toList());
-                Map<String, List<ProductModelParamsItem>> itemMap = cnItems.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName));
+                cnItems.sort(Comparator.comparing(ProductModelParamsItem::getBatchNumber));
+                Map<String, List<ProductModelParamsItem>> 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();
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 = "";