|
@@ -152,21 +152,19 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
|
|
|
if(jyUser == null){
|
|
|
throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
|
|
|
}
|
|
|
- if(pro != null && pro.getUserId().equals(jyUser.getUserId())){
|
|
|
- throw new BusinessException(ResultCode.AUTH_ERROR);
|
|
|
- }
|
|
|
- if(plus != null && plus.getUserId().equals(jyUser.getUserId())){
|
|
|
+ Long sceneUserId = pro == null ? plus.getUserId():pro.getUserId();
|
|
|
+
|
|
|
+ if(sceneUserId.equals(jyUser.getUserId())){
|
|
|
throw new BusinessException(ResultCode.AUTH_ERROR);
|
|
|
}
|
|
|
+ JyUser sceneJyUser = jyUserService.getByUserId(sceneUserId);
|
|
|
|
|
|
JySceneUserAuth auth = this.getByNumAndJyUserId(jyUser.getId(),param.getNum());
|
|
|
if(auth != null){
|
|
|
param.setId(auth.getId());
|
|
|
}
|
|
|
param.setJyUserId(jyUser.getId());
|
|
|
- SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
|
|
|
- JyUser loginUser = jyUserService.getBySysId(byId.getId());
|
|
|
- param.setAuthorId(loginUser.getId());
|
|
|
+ param.setAuthorId(sceneJyUser.getId());
|
|
|
this.saveOrUpdate(param);
|
|
|
|
|
|
}
|