From 9bb1f2a06dbcfb7b6c7b100e1b51363cdc359554 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 21:14:10 +0800
Subject: [PATCH] 社区后台基础数据库修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 2f71757..856fcf1 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
@@ -181,9 +181,9 @@
// comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
// }
//设置户主关系
- ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
- if (comMngPopulationHouseUserDO != null) {
- comMngPopulationVO.setRelation(comMngPopulationHouseUserDO.getRelation());
+ List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
+ if (!comMngPopulationHouseUserDOS.isEmpty()) {
+ comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
}
//设置年龄
if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
@@ -770,13 +770,18 @@
}
}
- //查询当前用户所有戶主关系
- List<Integer> relations = comMngPopulationHouseUserDAO.getPopulationRelationByUserId(vo.getId());
- if (!relations.isEmpty()) {
- ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
- .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
- comMngPopulationHouseUserDO.setRelation(relations.get(relations.size() - 1));
+ ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+ .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
+ if (comMngPopulationHouseUserDO != null) {
+ comMngPopulationHouseUserDO.setRelation(vo.getRelation());
comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
+ }else {
+ comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
+ comMngPopulationHouseUserDO.setId(Snowflake.getId());
+ comMngPopulationHouseUserDO.setPopulId(vo.getId());
+ comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+ comMngPopulationHouseUserDO.setCreateAt(new Date());
+ comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
}
if (populationDAO.updateById(populationDO) > 0) {
return R.ok();
--
Gitblit v1.7.1