diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 639295e01..126e7d996 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1588,6 +1588,11 @@ public class AppUserServiceImpl implements AppUserService { epdcUserRegistFormDTO.setGridId(deptId); UserDTO userDTO = this.packageUserDto(epdcUserRegistFormDTO,nmpWxUser.getUnionid(),nmpWxUser.getOpenid(),completeDept); userDTO.setDeptId(deptId); + userDTO.setPartyFlag(String.valueOf(formDto.getPartyFlag())); + userDTO.setShibei(formDto.getShibei()); + userDTO.setWorkUnit(formDto.getWorkUnit()); + userDTO.setWorkType(formDto.getWorkType()); + userDTO.setWorkIndustry(formDto.getWorkIndustry()); // IP地址 HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); userDTO.setLastLoginIp(IpUtils.getIpAddr(request)); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java index 66f91f9d3..acebaeaad 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java @@ -18,12 +18,12 @@ package com.elink.esua.epdc.user.dto; -import java.io.Serializable; -import java.util.Date; - import com.elink.esua.epdc.user.enums.AppUserStatesEnum; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 用户信息表 @@ -363,4 +363,26 @@ public class UserDTO implements Serializable { * 是否租房 */ private String driverFlag; + + + + /** + * 工作单位 + */ + private String workUnit; + + /** + * 单位性质 + */ + private String workType; + + /** + * 工作单位行业 + */ + private String workIndustry; + + /** + * 是否居住在市北 + */ + private Integer shibei; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java index 237b7959f..55b7d5013 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java @@ -18,8 +18,6 @@ package com.elink.esua.epdc.user.entity; import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import com.elink.esua.epdc.commons.mybatis.entity.DeptScope; import lombok.Data; import lombok.EqualsAndHashCode; @@ -270,4 +268,24 @@ public class UserEntity extends DeptScope { * 活跃积分 */ private Integer activePoints; + + /** + * 工作单位 + */ + private String workUnit; + + /** + * 单位性质 + */ + private String workType; + + /** + * 工作单位行业 + */ + private String workIndustry; + + /** + * 是否居住在市北 + */ + private Integer shibei; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java index 5924703a8..3fdaae6e2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java @@ -2072,6 +2072,7 @@ public class UserServiceImpl extends BaseServiceImpl implem dto.setSwitchedTime(new Date()); userGridRelationService.save(dto); - return new Result().ok("注册成功"); + userDto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); + return new Result().ok(userDto); } }