From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 1e85929..4cb8049 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -119,7 +119,7 @@
         }
         Page userPage = new Page(pageComMngVillageDTO.getPageNum(), pageComMngVillageDTO.getPageSize());
         IPage<ComMngVillageDO> doPager =
-            comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt));
+            comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getName));
 
         IPage<ComMngVillageVO> villageVOIPage = new Page<>();
         villageVOIPage.setCurrent(doPager.getCurrent());
@@ -233,6 +233,7 @@
             return R.fail("id有误!");
         }
         BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
+        comMngVillageDO.setName(comMngVillageVO.getGroupAt());
         ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
         if (comActDO == null || comActDO.getStreetId() == null) {
             return R.fail("社区没有绑定街道,请绑定后操作!");
@@ -283,6 +284,12 @@
             new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
     }
 
+    @Override
+    public R getGridVillageListApp(ComMngVillageListAppDTO villageListAppDTO) {
+        return R.ok(this.baseMapper.getGridVillageList(
+                new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
+    }
+
     /**
      * 综治app-根据小区id查询小区下楼栋列表
      * 

--
Gitblit v1.7.1