Merge remote-tracking branch 'remotes/origin/dev_bugfix_user_cache' into dev

5 years ago · 1f88b8b961
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@ -262,7 +262,7 @@ public class UserBaseInfoRedis {
                }else{
                    return null;
                }
-                RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
+                RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserIdAndCustomerId(userId,customerId);
                if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
                    baseInfo.setCustomerId(relation.getCustomerId());
                }else{