Compare commits
No commits in common. "ccd4831453208be3807662e24a8a3463dfc404e5" and "40450a24e7703d432d5d0b6f484b023d4342bdbd" have entirely different histories.
ccd4831453
...
40450a24e7
|
@ -285,7 +285,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
UserEntity userInfo;
|
UserEntity userInfo = new UserEntity();
|
||||||
|
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
|
||||||
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
||||||
userInfo1.setArtificerOpenId(userInfo1.getOpenId());
|
userInfo1.setArtificerOpenId(userInfo1.getOpenId());
|
||||||
userInfo1.setOpenId(null);
|
userInfo1.setOpenId(null);
|
||||||
|
@ -304,7 +305,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
userInfo.setUpdateTime(date);
|
userInfo.setUpdateTime(date);
|
||||||
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
|
|
||||||
baseMapper.updateById(userInfo);
|
baseMapper.updateById(userInfo);
|
||||||
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
||||||
Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());
|
Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());
|
||||||
|
|
Loading…
Reference in New Issue