From e959172a457f60c2e16b69f60e3404df5fdffcfe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 12 十一月 2021 16:54:23 +0800
Subject: [PATCH] 1112修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 0d9d628..1a1de18 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -4996,6 +4996,7 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+ populationDO.setDeath(vo.getDeath().toString());
String cardNoAES = populationDO.getCardNo();
try {
@@ -6572,17 +6573,19 @@
public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
-
- iPage.getRecords().forEach(page -> {
- if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
- StringBuilder sb = new StringBuilder();
- sb.append(page.getAlley());
- if(!page.getHouseNum().contains("号")){
- sb.append(page.getHouseNum() + "号");
+ if(iPage!=null){
+ iPage.getRecords().forEach(page -> {
+ if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
+ StringBuilder sb = new StringBuilder();
+ sb.append(page.getAlley());
+ if(!page.getHouseNum().contains("号")){
+ sb.append(page.getHouseNum() + "号");
+ }
+ page.setAreaName(sb.toString());
}
- page.setAreaName(sb.toString());
- }
- });
+ });
+ }
+
return R.ok(iPage);
}
--
Gitblit v1.7.1