Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -219,6 +219,17 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
                     categories.add(bean);
                 }
             }
+            //将党员放在最前面
+            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));
+            }
             dto.setCategoryList(categories);
             return dto;
         }).collect(Collectors.toList());