公开浏览，新增编辑授权

src/main/java/com/fdkankan/manage/entity/JySceneUserAuth.java

@@ -109,7 +109,7 @@ public class JySceneUserAuth implements Serializable {
     @TableField(exist = false)
     private String ryNickName;
 
-    @TableField(exist = false)
+    @TableField("auth_type")
     private Integer authType = 0;   //0授权用户，1公开访问
 
     @TableField("can_del")

src/main/java/com/fdkankan/manage/service/IJySceneUserAuthService.java

@@ -30,7 +30,7 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
     JySceneUserAuth getByNumAndRyId(String num, String ryId);
     JySceneUserAuth getByNumAndRyNo(String num, String ryNo);
 
-    JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num);
+    JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num,Integer authType);
 
     Object checkAuthOther(JySceneUserAuth param);
 

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

@@ -103,9 +103,9 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             throw new BusinessException(ResultCode.USER_NOT_EXIST);
         }
 
-
         LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JySceneUserAuth::getNum,param.getNum());
+        wrapper.eq(JySceneUserAuth::getAuthType,param.getAuthType());
         if(!sceneUserId.equals(loginUser.getUserId()) && sysRoleId!=null && !sysRoleId.equals(1L) && !sysRoleId.equals(45L) ){
             List<Integer> ids = new ArrayList<>();
             getSubAuthorIdsById(loginUser.getId(),param.getNum(),ids);
@@ -188,7 +188,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum());
+        JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum(),param.getAuthType());
         if(jySceneUserAuth != null && param.getCanDel() != 1){
             throw new BusinessException(ResultCode.SCENE_AUTH_EXITS);
         }
@@ -217,7 +217,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         }
         JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
         if(jySceneAuth == null){
-            jySceneAuth = new JySceneAuth(0);
+            jySceneAuth = new JySceneAuth(param.getAuthType());
             jySceneAuth.setNum(param.getNum());
             jySceneAuthService.save(jySceneAuth);
         }
@@ -239,10 +239,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     }
 
     @Override
-    public JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num) {
+    public JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num,Integer authType) {
         LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
         wrapper.eq(JySceneUserAuth::getNum,num);
+        wrapper.eq(JySceneUserAuth::getAuthType,authType);
         return this.getOne(wrapper);
     }
 
@@ -252,7 +253,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        return this.getByNumAndJyUserId(jyUser.getId(),num);
+        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(num);
+        if(jySceneAuth == null){
+            throw new BusinessException(ResultCode.DEL_AUTH_ERROR);
+        }
+        return this.getByNumAndJyUserId(jyUser.getId(),num,jySceneAuth.getAuthType());
     }
 
     @Override
@@ -261,7 +266,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        return this.getByNumAndJyUserId(jyUser.getId(),num);
+        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(num);
+        if(jySceneAuth == null){
+            throw new BusinessException(ResultCode.DEL_AUTH_ERROR);
+        }
+        return this.getByNumAndJyUserId(jyUser.getId(),num,jySceneAuth.getAuthType());
     }
 
     @Override
@@ -283,7 +292,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             vo.setEditAuth(1);
             vo.setLookAuth(1);
         }else {
-            JySceneUserAuth auth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum());
+            JySceneUserAuth auth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum(),param.getAuthType());
             if(auth !=null){
                 if(auth.getCanAuthLook() == 1 ){
                     vo.setLookAuth(auth.getLookAuth());
@@ -344,7 +353,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
         //if(jySceneAuth != null  && jySceneAuth.getAuthType() == 0){
         if(jySceneAuth != null  ){
-            JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);
+            JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num,jySceneAuth.getAuthType());
             if(jySceneUserAuth != null){
                 Date date = new Date();
                 if(jySceneUserAuth.getLookAuth() == 1 ||

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

@@ -349,7 +349,7 @@ 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());
+                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);

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -21,4 +21,5 @@ public class SceneParam extends RequestBase {
 
     private String ryId;
     private String ryNo;
+    private Integer authType;
 }