1

src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -234,11 +234,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public void giveSuperAdmin(Long userId) {
-//        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
-//        wrapper.eq(CameraDetail::getUserId,userId);
-//        wrapper.set(CameraDetail::getUserId,1L);
-//        this.update(wrapper);
-
+        //删除用户通知深时修改场景归属
         laserService.updateUser(new LaserUpdateUserVo(userId,"13800138001",816L));
 
         LambdaUpdateWrapper<ScenePro> wrapper1 = new LambdaUpdateWrapper<>();

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -203,7 +203,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         SysUser byId = sysUserService.getById(result.getId());
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
         JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);
-        if(jySceneAuth != null){
+        if(jySceneAuth != null && jySceneUserAuth !=null){
             Date date = new Date();
             if(jySceneUserAuth.getLookAuth() == 1 ||
                     ( jySceneUserAuth.getLookAuth() == 2 && jySceneUserAuth.getLookEndTime().getTime() >date.getTime())){