完善信息用户头像相关修改；党员认证时间相关修改

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

@@ -595,9 +595,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser();
 
         UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
-        if (StringUtils.isBlank(userDto.getWxUnionId())) {
-            userDto.setWxUnionId(null);
-        }
+        userDto.setWxUnionId(StringUtils.isBlank(userDto.getWxUnionId()) ? null : userDto.getWxUnionId());
+        userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? null : userDto.getFaceImg());
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
         String userId = userDto.getId();
@@ -620,7 +619,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             partyMembersEntity.setGridName(userGridRelation.getGrid());
             partyMembersEntity.setRegistFlag(PartyMemberRegFlagEnum.AUTO.getValue());
             partyMembersEntity.setMobile(userDto.getMobile());
-            partyMembersEntity.setRegistTime(oldEntity.getRegisterTime());
+            partyMembersEntity.setRegistTime(new Date());
             QueryWrapper<PartyMembersEntity> partyWrapper = new QueryWrapper<>();
             partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                     .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
@@ -636,7 +635,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 authenticationFailedEntity.setRealName(userDto.getRealName());
                 authenticationFailedEntity.setMobile(userDto.getMobile());
                 authenticationFailedEntity.setIdentityNo(identityNo);
-                authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
+                authenticationFailedEntity.setRegistTime(new Date());
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
                 userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
@@ -692,7 +691,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
-        userDto.setFaceImg(oldEntity.getFaceImg());
+        userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? oldEntity.getFaceImg() : userDto.getFaceImg());
         return result.ok(userDto);
     }