Merge remote-tracking branch 'origin/hotfix/ResidentClient_bug'

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -24,9 +24,9 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum;
-import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -39,6 +39,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
@@ -49,22 +50,9 @@ import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dao.UserDao;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.constant.AuthenticatedConsant;
-import com.elink.esua.epdc.constant.UserFieldConsant;
-import com.elink.esua.epdc.dao.*;
-import com.elink.esua.epdc.dto.CachingUserInfoDTO;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.*;
@@ -78,12 +66,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.*;
 import com.elink.esua.epdc.util.AppUserUtils;
 import com.google.common.collect.Lists;
-import com.elink.esua.epdc.exception.UserModuleErrorCode;
-import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.service.PartyMembersService;
-import com.elink.esua.epdc.service.UserGridRelationService;
-import com.elink.esua.epdc.service.UserInvitationRecordService;
-import com.elink.esua.epdc.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -94,10 +76,6 @@ import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户信息表
@@ -868,6 +846,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
         userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg());
+        userDto.setIdentityNo(findUser.getIdentityNo());
         return userDto;
     }