|
@ -342,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
partyMemberDTO.setName(map.get("NAME")); |
|
|
partyMemberDTO.setName(map.get("NAME")); |
|
|
partyMemberDTO.setIdCard(map.get("ID_CARD")); |
|
|
partyMemberDTO.setIdCard(map.get("ID_CARD")); |
|
|
partyMemberDTO.setMobile(map.get("MOBILE")); |
|
|
partyMemberDTO.setMobile(map.get("MOBILE")); |
|
|
|
|
|
partyMemberDTO.setCulture(map.get("CULTURE")); |
|
|
|
|
|
|
|
|
String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID")); |
|
|
String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID")); |
|
|
partyMemberDTO.setAddress(houseAddress); |
|
|
partyMemberDTO.setAddress(houseAddress); |
|
@ -606,6 +607,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
} else { |
|
|
} else { |
|
|
partyMemberDTO.setMobile(icResiUser.getMobile()); |
|
|
partyMemberDTO.setMobile(icResiUser.getMobile()); |
|
|
} |
|
|
} |
|
|
|
|
|
if (map.containsKey("CULTURE")) { |
|
|
|
|
|
partyMemberDTO.setCulture(map.get("CULTURE")); |
|
|
|
|
|
} else { |
|
|
|
|
|
partyMemberDTO.setCulture(icResiUser.getCulture()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//查询网格信息
|
|
|
//查询网格信息
|
|
|
String gridId = null; |
|
|
String gridId = null; |
|
|
if (map.containsKey("GRID_ID")) { |
|
|
if (map.containsKey("GRID_ID")) { |
|
@ -2438,6 +2445,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
user.setName(formDTO.getName()); |
|
|
user.setName(formDTO.getName()); |
|
|
user.setMobile(formDTO.getMobile()); |
|
|
user.setMobile(formDTO.getMobile()); |
|
|
user.setIsParty(NumConstant.ONE_STR); |
|
|
user.setIsParty(NumConstant.ONE_STR); |
|
|
|
|
|
user.setCulture(formDTO.getCulture()); |
|
|
//如果是党员中心户,则居民是志愿者
|
|
|
//如果是党员中心户,则居民是志愿者
|
|
|
if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) { |
|
|
if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) { |
|
|
user.setIsVolunteer(NumConstant.ONE_STR); |
|
|
user.setIsVolunteer(NumConstant.ONE_STR); |
|
|