Commit 453b1557 authored by 技术部-任文超's avatar 技术部-任文超

Merge branch 'master' into feature/apollo

parents 65fd11d8 a58a13fe
...@@ -716,7 +716,7 @@ public class MotanUserServiceImpl implements UserMotanService { ...@@ -716,7 +716,7 @@ public class MotanUserServiceImpl implements UserMotanService {
context.setChannelId(null); context.setChannelId(null);
context.setCreatedFrom(user.getRegisteredFrom()); context.setCreatedFrom(user.getRegisteredFrom());
context.setAppChannel(""); context.setAppChannel("");
if(user.getRegisteredFrom() == 222L) { if(Objects.equals(user.getRegisteredFrom(), 222L)) {
UserBtRegister userBtRegister =null; UserBtRegister userBtRegister =null;
try{ try{
userBtRegister=userBtRegisterService.findByUserId(user.getId()); userBtRegister=userBtRegisterService.findByUserId(user.getId());
......
...@@ -102,7 +102,7 @@ public class AuthInfoController implements IBaseController { ...@@ -102,7 +102,7 @@ public class AuthInfoController implements IBaseController {
context.setChannelId(null); context.setChannelId(null);
context.setCreatedFrom(user.getRegisteredFrom()); context.setCreatedFrom(user.getRegisteredFrom());
context.setAppChannel(""); context.setAppChannel("");
if(user.getRegisteredFrom() == 222L) { if(Objects.equals(user.getRegisteredFrom(), 222L)) {
UserBtRegister userBtRegister =null; UserBtRegister userBtRegister =null;
try{ try{
userBtRegister=userBtRegisterService.findByUserId(user.getId()); userBtRegister=userBtRegisterService.findByUserId(user.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment