1

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

@@ -401,11 +401,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             if( byId.getRoleId() == 1L || jyUser.getUserId().equals(record.getUserId())){
                 record.setIsAuth(true);
-                record.setEditAuth(1);
+                record.setEditAuth(true);
                 record.setIsAuthOther(true);
             }else if((byId.getRoleId() == 45L || byId.getRoleId() == 48L) && jyUser.getPlatformId().equals(record.getPlatformId())){
                 record.setIsAuth(true);
-                record.setEditAuth(1);
+                record.setEditAuth(true);
                 record.setIsAuthOther(true);
             } else if(param.getAuthNumList().contains(record.getNum())) {
                 JySceneAuth jySceneAuth = jySceneAuthService.getByNum(record.getNum());
@@ -415,8 +415,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         record.setIsAuth(true);
                     }
                     if(jySceneUserAuth != null){
-                        record.setEditAuth(jySceneUserAuth.getEditAuth());
-                        record.setEditEndTime(jySceneUserAuth.getEditEndTime());
+                        record.setEditAuth(jySceneUserAuth.getEditAuth() == 1);
+                        if(jySceneUserAuth.getEditAuth() == 2){
+                            record.setEditAuth(jySceneUserAuth.getEditEndTime().getTime() > new Date().getTime());
+                        }
                     }
                 }
             }else {

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -33,7 +33,7 @@ public class SceneVo {
     private Boolean isAuth = false;          //是否有授权按钮
     private Boolean isAuthOther = false;     //是否有授权其他人选项按钮
 
-    private Integer editAuth =0;     //编辑权限 是否有浏览权限0否，1不限时查看，2限时查看
+    private Boolean editAuth =false;     //编辑权限 是否有浏览权限0否，1不限时查看，2限时查看
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date editEndTime ;