From 555f762284195c021783e496d2fcf9303533cd88 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期二, 30 七月 2024 17:58:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
index 9cbe22a..4bbd92b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
@@ -109,8 +109,8 @@
sysUserInputDO.setIsPanzhihua(eexcelUserDTO.getIsPanZhiHua().equals("是") ? 1 : 0);
sysUserInputDO.setIsRent(eexcelUserDTO.getIsRent().equals("是") ? 1 : 0);
sysUserInputDO.setKeyPersonnel(eexcelUserDTO.getKeyPersonnel().equals("是") ? 1 : 0);
- sysUserInputDO.setLowincomeHouseholds(eexcelUserDTO.getLowIncomeHouseholds().equals("是") ? 1 : 0);
- sysUserInputDO.setLowincomePeople(eexcelUserDTO.getLowIncomePeople().equals("是") ? 1 : 0);
+ sysUserInputDO.setLowIncomeHouseholds(eexcelUserDTO.getLowIncomeHouseholds().equals("是") ? 1 : 0);
+ sysUserInputDO.setLowIncomePeople(eexcelUserDTO.getLowIncomePeople().equals("是") ? 1 : 0);
sysUserInputDO.setMajor(eexcelUserDTO.getMajor().equals("是") ? 1 : 0);
sysUserInputDO.setMaritalStatus(eexcelUserDTO.getMaritalStatus().equals("是") ? 1 : 0);
sysUserInputDO.setName(eexcelUserDTO.getName());
@@ -147,10 +147,11 @@
*/
@Override
public CommunityUserInfoVO detailUserComunity(Long userId) {
- CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
- userId = userId - 100000000l;
+ CommunityUserInfoVO communityUserInfoVO=null;
+// userId = userId - 100000000l;
SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId);
if (!org.springframework.util.ObjectUtils.isEmpty(sysUserInputDO)) {
+ communityUserInfoVO = new CommunityUserInfoVO();
BeanUtils.copyProperties(sysUserInputDO, communityUserInfoVO);
String idCard = sysUserInputDO.getIdCard();
if (!org.springframework.util.ObjectUtils.isEmpty(idCard)) {
@@ -164,8 +165,8 @@
Integer keyPersonnel = sysUserInputDO.getKeyPersonnel();
Integer specialServiceFamily = sysUserInputDO.getSpecialServiceFamily();
Integer soldier = sysUserInputDO.getSoldier();
- Integer lowincomeHouseholds = sysUserInputDO.getLowincomeHouseholds();
- Integer lowincomePeople = sysUserInputDO.getLowincomePeople();
+ Integer lowincomeHouseholds = sysUserInputDO.getLowIncomeHouseholds();
+ Integer lowincomePeople = sysUserInputDO.getLowIncomePeople();
Integer oldPeople = sysUserInputDO.getOldPeople();
Integer disability = sysUserInputDO.getDisability();
@@ -266,8 +267,8 @@
Integer keyPersonnel = sysUserInputDO.getKeyPersonnel();
Integer specialServiceFamily = sysUserInputDO.getSpecialServiceFamily();
Integer soldier = sysUserInputDO.getSoldier();
- Integer lowincomeHouseholds = sysUserInputDO.getLowincomeHouseholds();
- Integer lowincomePeople = sysUserInputDO.getLowincomePeople();
+ Integer lowincomeHouseholds = sysUserInputDO.getLowIncomeHouseholds();
+ Integer lowincomePeople = sysUserInputDO.getLowIncomePeople();
Integer oldPeople = sysUserInputDO.getOldPeople();
Integer disability = sysUserInputDO.getDisability();
@@ -403,8 +404,8 @@
sysUserInput.setKeyPersonnel(0);
sysUserInput.setSpecialServiceFamily(0);
sysUserInput.setSoldier(0);
- sysUserInput.setLowincomeHouseholds(0);
- sysUserInput.setLowincomePeople(0);
+ sysUserInput.setLowIncomeHouseholds(0);
+ sysUserInput.setLowIncomePeople(0);
sysUserInput.setOldPeople(0);
sysUserInput.setDisability(0);
});
--
Gitblit v1.7.1