From 431b80d10a965e45acdb3dca00808e4454da64d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 6 Jun 2023 17:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=A4=87=E6=A1=88-=E6=9C=AC=E6=AC=A1=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0=E4=B8=8E=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8F=98=E5=8C=96=E6=8C=89=E7=B3=BB=E7=BB=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaSjSjxtbhServiceImpl.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
index 0f425e829..6f08b301e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
@@ -19,6 +19,7 @@ import com.jero.modules.ota.utils.ComparisonUtil;
 import com.jero.modules.ota.utils.ImportFileUtil;
 import com.jero.modules.project.util.WordUtil;
 import com.jero.modules.split.common.FileUnZip;
+import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -193,6 +194,17 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
         if (ObjectUtil.isEmpty(res)) {
             res = getByOtaId(otaIdT);
         }
+        if (ObjectUtil.isNotEmpty(res)) {
+            Collections.sort(res, (arg0, arg1) -> {
+                if (null == arg0.getXtmc()) {
+                    arg0.setXtmc("");
+                }
+                if (null == arg1.getXtmc()) {
+                    arg1.setXtmc("");
+                }
+                return arg0.getXtmc().compareTo(arg1.getXtmc());
+            });
+        }
         JSONObject json = new JSONObject();
         json.put("list", res);
         return json;