房屋查询党员放在最前面

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;
+            if(CollectionUtils.isNotEmpty(categories)) {
-            for (int i = 0; i < categories.size(); i++) {
+                int a = 0;
-                if ("党员".equals(categories.get(i).getName())) {
+                for (int i = 0; i < categories.size(); i++) {
-                    a = i;
+                    if ("党员".equals(categories.get(i).getName())) {
-                    break;
+                        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());