|
@@ -66,6 +66,14 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
|
|
|
throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
|
|
|
}
|
|
|
param.setPlatformId(loginPlatformId);
|
|
|
+ if(param.getStatus() == null){
|
|
|
+ JyPlatformUserWait jyPlatformUserWait = platformUserWaitService.getById(param.getId());
|
|
|
+ if(jyPlatformUserWait!= null){
|
|
|
+ platformUserWaitService.updatePlatformId(jyPlatformUserWait.getId(),loginPlatformId);
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
JyUser jyUser = jyUserService.getById(param.getId());
|
|
|
SysUser byId = sysUserService.getById(jyUser.getSysUserId());
|
|
|
if(byId.getRoleId() != 47L ){
|
|
@@ -157,7 +165,6 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
|
|
|
if(jyPlatformUserWait != null){
|
|
|
JyUserPlatform jyUserPlatform = new JyUserPlatform();
|
|
|
BeanUtils.copyProperties(jyPlatformUserWait,jyUserPlatform);
|
|
|
- jyUserPlatform.setId(null);
|
|
|
jyUserPlatforms.add(jyUserPlatform);
|
|
|
}
|
|
|
|