lyhzzz 1 jaar geleden
bovenliggende
commit
d169581af3

+ 16 - 7
src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -14,6 +14,7 @@ import com.fdkankan.manage.mapper.IJySceneUserAuthMapper;
 import com.fdkankan.manage.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.vo.request.SceneParam;
+import com.fdkankan.manage.vo.response.CheckOtherVo;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.manage.vo.response.SceneAuthVo;
 import com.fdkankan.redis.util.RedisUtil;
@@ -197,16 +198,24 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(pro == null && plus == null){
             throw new BusinessException(ResultCode.SCENE_NOT_EXITS);
         }
+        Long sceneUserId = pro == null ? plus.getUserId() :pro.getUserId();
+        CheckOtherVo vo = new CheckOtherVo();
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
-        if( byId.getRoleId() == 1L || byId.getRoleId() ==45L || (pro != null && jyUser.getUserId().equals(pro.getUserId()))){
-            return true;
-        }
-        if(byId.getRoleId() == 1L || byId.getRoleId() ==45L || (plus != null && jyUser.getUserId().equals(plus.getUserId()))){
-            return true;
+        if( byId.getRoleId() == 1L || byId.getRoleId() ==45L ||  jyUser.getUserId().equals(sceneUserId)){
+            vo.setIsAuthor(1);
+            vo.setEditAuth(1);
+            vo.setLookAuth(1);
+        }else {
+            JySceneUserAuth auth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum());
+            if(auth !=null){
+                vo.setLookAuth(auth.getLookAuth());
+                vo.setLookEndTime(auth.getLookEndTime());
+                vo.setEditAuth(auth.getEditAuth());
+                vo.setEditEndTime(auth.getEditEndTime());
+            }
         }
-
-        return false;
+        return vo;
     }
 
     @Autowired

+ 20 - 0
src/main/java/com/fdkankan/manage/vo/response/CheckOtherVo.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.vo.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CheckOtherVo {
+
+    private Integer editAuth =0 ;       //编辑权限 是否有浏览权限0否,1不限时查看,2限时查看
+    private Integer lookAuth = 0;       //查看权限 是否有编辑权限0否,1不限时编辑,2限时编辑
+    private Integer isAuthor = 0;       //是否可授权他人 0不可,1可以
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lookEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date editEndTime;
+}