|
@@ -297,16 +297,18 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
|
|
|
|
|
|
SysUser byId = sysUserService.getById(result.getId());
|
|
SysUser byId = sysUserService.getById(result.getId());
|
|
JyUser jyUser = jyUserService.getBySysId(byId.getId());
|
|
JyUser jyUser = jyUserService.getBySysId(byId.getId());
|
|
- JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);
|
|
|
|
- if(jySceneAuth != null && jySceneUserAuth !=null){
|
|
|
|
- Date date = new Date();
|
|
|
|
- if(jySceneUserAuth.getLookAuth() == 1 ||
|
|
|
|
- ( jySceneUserAuth.getLookAuth() == 2 && jySceneUserAuth.getLookEndTime().getTime() >date.getTime())){
|
|
|
|
- sceneAuthVo.setViewAuth(true);
|
|
|
|
- }
|
|
|
|
- if(jySceneUserAuth.getEditAuth() == 1 ||
|
|
|
|
- (jySceneUserAuth.getEditAuth() == 2 && jySceneUserAuth.getEditEndTime().getTime() >date.getTime())){
|
|
|
|
- sceneAuthVo.setEditAuth(true);
|
|
|
|
|
|
+ if(jySceneAuth != null && jySceneAuth.getAuthType() == 0){
|
|
|
|
+ JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);
|
|
|
|
+ if(jySceneUserAuth != null){
|
|
|
|
+ Date date = new Date();
|
|
|
|
+ if(jySceneUserAuth.getLookAuth() == 1 ||
|
|
|
|
+ ( jySceneUserAuth.getLookAuth() == 2 && jySceneUserAuth.getLookEndTime().getTime() >date.getTime())){
|
|
|
|
+ sceneAuthVo.setViewAuth(true);
|
|
|
|
+ }
|
|
|
|
+ if(jySceneUserAuth.getEditAuth() == 1 ||
|
|
|
|
+ (jySceneUserAuth.getEditAuth() == 2 && jySceneUserAuth.getEditEndTime().getTime() >date.getTime())){
|
|
|
|
+ sceneAuthVo.setEditAuth(true);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|