lyhzzz 8 months ago
parent
commit
ce195a4ac2

+ 8 - 2
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -399,11 +399,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setIsCopy(true);
                 }
             }
-            if( byId.getRoleId() == 1L || byId.getRoleId() == 45L || byId.getRoleId() == 48L || jyUser.getUserId().equals(record.getUserId())){
+            if( byId.getRoleId() == 1L || jyUser.getUserId().equals(record.getUserId())){
                 record.setIsAuth(true);
                 record.setEditAuth(1);
                 record.setIsAuthOther(true);
-            }else {
+            }else if((byId.getRoleId() == 45L || byId.getRoleId() == 48L) && jyUser.getPlatformId().equals(record.getPlatformId())){
+                record.setIsAuth(true);
+                record.setEditAuth(1);
+                record.setIsAuthOther(true);
+            } else if(param.getAuthNumList().contains(record.getNum())) {
                 JySceneAuth jySceneAuth = jySceneAuthService.getByNum(record.getNum());
                 if(jySceneAuth != null){
                     JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), record.getNum(),jySceneAuth.getAuthType());
@@ -415,6 +419,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         record.setEditEndTime(jySceneUserAuth.getEditEndTime());
                     }
                 }
+            }else {
+                record.setIsShare(true);
             }
 
         }

+ 4 - 0
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -41,4 +41,8 @@ public class SceneVo {
 
     private Integer id;
 
+    private Integer platformId;
+
+    private Boolean isShare = false;
+
 }

+ 1 - 1
src/main/resources/mapper/manage/SceneProMapper.xml

@@ -30,7 +30,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site , e.thumb
-        ,algorithm_time,s.user_id
+        ,algorithm_time,s.user_id,jy.platform_id
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         left join t_user u on s.user_id = u.id