体验

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -288,16 +288,19 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         } else {
             List<Integer> joinedCps = userLogin.getJoinedCps();
             userWxLogin.setUserId(userLogin.getUserId());
+            if (userLogin.getCurrentCp()==null){
+                userLogin.setCurrentCp(userWxLogin.getCurrentCp());
+            }
             if (joinedCps == null) {
                 joinedCps = new ArrayList<>();
                 joinedCps.add(userWxLogin.getCurrentCp());
                 userWxLogin.setJoinedCps(joinedCps);
-                userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
+                userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
             if (joinedCps != null && !joinedCps.contains(userWxLogin.getCurrentCp())) {
                 joinedCps.add(userWxLogin.getCurrentCp());
                 userWxLogin.setJoinedCps(joinedCps);
-                userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
+                userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
         }