From 2e2a241d0365acf73dfe17087f2541b1a1edb337 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 18 十月 2021 18:05:23 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 3 ++-
1 files changed, 2 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..9234305 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("社区没有绑定街道，请绑定后操作！");
--
Gitblit v1.7.1