合并用户bug修改

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

@@ -38,7 +38,10 @@ import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
 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.dao.PartyAuthenticationFailedDao;
+import com.elink.esua.epdc.dao.PartyMembersDao;
+import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
+import com.elink.esua.epdc.dao.UserDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
@@ -56,7 +59,6 @@ import com.elink.esua.epdc.service.UserGridRelationService;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
 import com.elink.esua.epdc.service.UserTagRelationService;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +66,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.logging.Logger;
 
 /**
  * 用户信息表
@@ -1059,18 +1060,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if(!"0".equals(oIdUser.getState())){
             // 处理user表积分，删除小程序用户
             updateUserInfo(uIdUser, oIdUser,unionId);
-            // 处理网格关系表
-            updateUerGridRelation(uIdUser,oIdUser );
             // 处理积分日志
             updatePointLogs(uIdUser,oIdUser );
+            // 处理网格关系表
+            updateUerGridRelation(uIdUser,oIdUser );
 
         }else {
             // 处理user表积分，删除小程序用户
             updateUserInfo(oIdUser, uIdUser,unionId);
-            // 处理网格关系表
-            updateUerGridRelation(oIdUser, uIdUser);
             // 处理积分日志
             updatePointLogs(oIdUser, uIdUser);
+            // 处理网格关系表
+            updateUerGridRelation(oIdUser, uIdUser);
         }
 
 
@@ -1106,7 +1107,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         userGridRelationService.maBindUnId(ljUser.getUserId(), mainUser.getUserId());
         // 修改完成后查询重复的网格关系数据，把重复并且createTime比较新的数据删除
         List<String> repeatUser = userGridRelationService.selectRepeatRelation(mainUser.getUserId());
-        userGridRelationService.deleteBatchIds(repeatUser);
+        if(repeatUser!=null && repeatUser.size()>0){
+            userGridRelationService.deleteBatchIds(repeatUser);
+        }
     }
 
     /**