|
@@ -349,14 +349,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
record.setIsAuthOther(true);
|
|
|
}else {
|
|
|
JySceneAuth jySceneAuth = jySceneAuthService.getByNum(record.getNum());
|
|
|
- JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), record.getNum(),jySceneAuth.getAuthType());
|
|
|
- if(jySceneUserAuth != null && (jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() ==1)
|
|
|
- && jySceneAuth!=null && jySceneAuth.getAuthType() == 0){
|
|
|
- record.setIsAuth(true);
|
|
|
- }
|
|
|
- if(jySceneAuth!=null && jySceneAuth.getAuthType() == 0 && jySceneUserAuth != null){
|
|
|
- record.setEditAuth(jySceneUserAuth.getEditAuth());
|
|
|
- record.setEditEndTime(jySceneUserAuth.getEditEndTime());
|
|
|
+ if(jySceneAuth != null){
|
|
|
+ JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), record.getNum(),jySceneAuth.getAuthType());
|
|
|
+ if(jySceneUserAuth != null && (jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() ==1)
|
|
|
+ && jySceneAuth!=null && jySceneAuth.getAuthType() == 0){
|
|
|
+ record.setIsAuth(true);
|
|
|
+ }
|
|
|
+ if(jySceneUserAuth != null){
|
|
|
+ record.setEditAuth(jySceneUserAuth.getEditAuth());
|
|
|
+ record.setEditEndTime(jySceneUserAuth.getEditEndTime());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|