From ef755fd15271d3fe461f2af5eb63cae235f10e78 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 19 Nov 2021 15:59:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E6=94=BE=E5=9C=A8=E6=9C=80=E5=89=8D=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcHouseServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 0dbfa5796a..18ee67f7ae 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -219,6 +219,15 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
                     categories.add(bean);
                 }
             }
+            //将党员放在最前面
+            int a = 0;
+            for (int i = 0; i < categories.size(); i++) {
+                if ("党员".equals(categories.get(i).getName())) {
+                    a = i;
+                    break;
+                }
+            }
+            categories.add(NumConstant.ZERO, categories.remove(a));
             dto.setCategoryList(categories);
             return dto;
         }).collect(Collectors.toList());

From 3e73458b7d9f3ccbe382bf86ceab87e33cf71b0b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 19 Nov 2021 16:08:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E6=94=BE=E5=9C=A8=E6=9C=80=E5=89=8D=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcHouseServiceImpl.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 18ee67f7ae..914bc68a56 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -220,14 +220,16 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
                 }
             }
             //将党员放在最前面
-            int a = 0;
-            for (int i = 0; i < categories.size(); i++) {
-                if ("党员".equals(categories.get(i).getName())) {
-                    a = i;
-                    break;
+            if(CollectionUtils.isNotEmpty(categories)) {
+                int a = 0;
+                for (int i = 0; i < categories.size(); i++) {
+                    if ("党员".equals(categories.get(i).getName())) {
+                        a = i;
+                        break;
+                    }
                 }
+                categories.add(NumConstant.ZERO, categories.remove(a));
             }
-            categories.add(NumConstant.ZERO, categories.remove(a));
             dto.setCategoryList(categories);
             return dto;
         }).collect(Collectors.toList());