1

src/main/java/com/fdkankan/manage/controller/CaseController.java

@@ -70,20 +70,24 @@ public class CaseController {
             param.setSysUserIds(Arrays.asList(byId.getId()));
         }
 
-        List<Integer> openCaseIds = new ArrayList<>();
-        List<Integer> authCaseIds = new ArrayList<>();
+        List<Integer> openCaseIds = null;
+        List<Integer> authCaseIds = null;
         HashMap<Integer,JySceneUserAuth> authHashMap = new HashMap<>();
+        HashMap<Integer,JySceneUserAuth> openHashMap = new HashMap<>();
         if(param.getIsShare() == 1){
-            if(byId.getRoleId() !=1 && jyUser.getPlatformId() != null ){
-                openCaseIds = jySceneAuthService.getCaseIdListByPlatform(jyUser.getPlatformId(), 1);
-                if(!openCaseIds.isEmpty()){
-                    caseIdAll.addAll(openCaseIds);
-                }
+            openCaseIds = jySceneAuthService.getCaseIdListByPlatform(jyUser.getPlatformId(), 1);
+            if(!openCaseIds.isEmpty()){
+                caseIdAll.addAll(openCaseIds);
+            }
+            List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
+            jySceneUserAuths.stream().filter(e ->e.getCaseId() != null && e.getAuthType() == 0).forEach( e-> authHashMap.put(e.getCaseId(),e));
+            jySceneUserAuths.stream().filter(e ->e.getCaseId() != null && e.getAuthType() == 1).forEach( e-> openHashMap.put(e.getCaseId(),e));
+
+            if(!authHashMap.isEmpty()){
+                List<Integer> finalOpenCaseIds = openCaseIds;
+                authCaseIds = authHashMap.keySet().stream().filter(e -> !finalOpenCaseIds.contains(e)).collect(Collectors.toList());
             }
-            List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserIdAndCaseId(jyUser.getId(),0,openCaseIds);
-            jySceneUserAuths.stream().filter(e ->e.getCaseId() != null).forEach( e-> authHashMap.put(e.getCaseId(),e));
-            authCaseIds = jySceneUserAuths.stream().map(JySceneUserAuth::getCaseId).collect(Collectors.toList());
-            if(!authCaseIds.isEmpty()){
+            if(authCaseIds != null && !authCaseIds.isEmpty()){
                 caseIdAll.addAll(authCaseIds);
             }
             param.setCaseIds(caseIdAll);
@@ -93,13 +97,19 @@ public class CaseController {
         }
         Page<Case> page = caseService.pageList(param);
         Date date = new Date();
+        List<Long> sysIds = page.getRecords().stream().map(Case::getSysUserId).collect(Collectors.toList());
+
+        HashMap<Long, SysUser> userMap = sysUserService.getByIds(new HashSet<>(sysIds));
         for (Case record : page.getRecords()) {
-            if(openCaseIds.contains(record.getCaseId())){
+            JySceneUserAuth jySceneUserAuth = null;
+            if(openCaseIds != null && openCaseIds.contains(record.getCaseId())){
                 record.setIsOpen(true);
+                jySceneUserAuth = openHashMap.get(record.getCaseId());
             }
-
-            if(authHashMap.containsKey(record.getCaseId())){
-                JySceneUserAuth jySceneUserAuth = authHashMap.get(record.getCaseId());
+            if(authCaseIds != null && authCaseIds.contains(record.getCaseId())){
+                 jySceneUserAuth = authHashMap.get(record.getCaseId());
+            }
+            if(jySceneUserAuth != null){
                 if(jySceneUserAuth.getIsAuthor() == 1 || jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() == 1){
                     record.setIsAuth(true);
                 }
@@ -108,6 +118,10 @@ public class CaseController {
                     record.setIsEdit(true);
                 }
             }
+            SysUser sysUser = userMap.get(record.getSysUserId());
+            if(sysUser != null){
+                record.setNickName(sysUser.getNickName());
+            }
 
         }
 
@@ -145,16 +159,6 @@ public class CaseController {
                 numList.addAll(caseNumType.getNumList());
             }
         }
-        if(!numList.isEmpty()){
-            List<CaseNum> list = caseNumService.getByNumList(numList);
-            Set<Integer> setIds = list.stream().map(CaseNum::getCaseId).collect(Collectors.toSet());
-            if(!setIds.isEmpty()){
-                List<Case> cases = caseService.listByIds(setIds);
-                if(!cases.isEmpty()){
-                    throw new BusinessException(ResultCode.NUM_IN_CASE);
-                }
-            }
-        }
         caseService.addOrUpdate(param);
         jySceneAuthService.delByNumList(numList);
         return ResultData.ok();

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

@@ -124,4 +124,7 @@ public class Case implements Serializable {
 
     @TableField(exist = false)
     private Boolean isAuth = false;
+
+    @TableField(exist = false)
+    private String nickName ;
 }

src/main/java/com/fdkankan/manage/mapper/IDataMapper.java

@@ -34,10 +34,10 @@ public interface IDataMapper {
     List<DataGroupByCount> sceneGroupBy(@Param("tb") String tb, @Param("dateFormat")String dateFormat,
                                         @Param("startTime")String startTime,@Param("endTime")String endTime);
     List<DataGroupByCount> sceneGroupBy(@Param("tb") String tb, @Param("dateFormat")String dateFormat,
-                                        @Param("startTime")String startTime,@Param("endTime")String endTime,@Param("userIds") List<Long> userIds);
+                                        @Param("startTime")String startTime,@Param("endTime")String endTime,@Param("userIds") List<Long> userIds,@Param("threeCamType")String threeCamType);
 
     List<DataGroupByCount> sceneGroupByWeek(@Param("tb") String tb,@Param("startTime")String startTime,@Param("endTime")String endTime);
-    List<DataGroupByCount> sceneGroupByWeek(@Param("tb") String tb,@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("userIds") List<Long> userIds);
+    List<DataGroupByCount> sceneGroupByWeek(@Param("tb") String tb,@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("userIds") List<Long> userIds,@Param("threeCamType")String threeCamType);
 
     List<DataGroupByCount> sceneObjGroupBy(@Param("tb") String tb, @Param("dateFormat")String dateFormat,
                                            @Param("startTime")String startTime,@Param("endTime")String endTime);

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.manage.entity.Case;
 import com.fdkankan.manage.entity.CaseNum;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.CaseNumType;
@@ -30,4 +31,6 @@ public interface ICaseNumService extends IService<CaseNum> {
     List<CaseNum> getByNum(String num);
 
     List<CaseNum> getByNumList(List<String> numList);
+
+    HashMap<String, Case> getMapByNumList(List<String> list);
 }

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

@@ -37,8 +37,6 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
     List<JySceneUserAuth> getByJyUserId(Integer jyUserId);
 
-    List<JySceneUserAuth> getByJyUserIdAndCaseId(Integer jyUserId, Integer authType, List<Integer> openCaseIds);
-    List<JySceneUserAuth> getByJyUserIdAndNum(Integer jyUserId, Integer authType, List<String> numList);
 
 
     Object checkNumAuth(String num,Integer caseId,String token,String clientIP,String userName,String password);

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

@@ -2,18 +2,21 @@ package com.fdkankan.manage.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.Case;
 import com.fdkankan.manage.entity.CaseNum;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.ICaseNumMapper;
 import com.fdkankan.manage.service.ICaseNumService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ICaseService;
 import com.fdkankan.manage.util.CaseNumTypeUtil;
 import com.fdkankan.manage.vo.request.CaseNumType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -106,4 +109,29 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNum> imp
         wrapper.in(CaseNum::getNum,numList);
         return this.list(wrapper);
     }
+
+    @Autowired
+    ICaseService caseService;
+    @Override
+    public HashMap<String, Case> getMapByNumList(List<String> numList) {
+        HashMap<String, Case> map = new HashMap<>();
+        if(numList == null || numList.isEmpty()){
+            return map;
+        }
+        List<CaseNum> list = this.getByNumList(numList);
+        Set<Integer> setIds = list.stream().map(CaseNum::getCaseId).collect(Collectors.toSet());
+        HashMap<Integer,Case> caseMap = new HashMap<>();
+        if(!setIds.isEmpty()){
+            List<Case> cases = caseService.listByIds(setIds);
+            if(!cases.isEmpty()){
+                cases.forEach(e -> caseMap.put(e.getCaseId(),e));
+            }
+        }
+        for (CaseNum caseNum : list) {
+            if(caseMap.get(caseNum.getCaseId()) != null){
+                map.put(caseNum.getNum()+caseNum.getNumType() ,caseMap.get(caseNum.getCaseId()));
+            }
+        }
+        return map;
+    }
 }

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

@@ -111,7 +111,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
             List<Integer> numType = CaseNumTypeUtil.getNumType(caseNumType.getType());
 
             for (Integer type : numType) {
-                List<String> numList = caseNumType.getNumList().stream().filter(e -> CaseNumTypeUtil.getCaseNumType(e, caseNumType.getType()).equals(type)).collect(Collectors.toList());
+                List<String> numList = caseNumType.getNumList().stream().filter(e ->StringUtils.isNotBlank(e) && CaseNumTypeUtil.getCaseNumType(e, caseNumType.getType()) != null
+                        && CaseNumTypeUtil.getCaseNumType(e, caseNumType.getType()).equals(type)).collect(Collectors.toList());
                 CaseNumType numType1 = new CaseNumType();
                 numType1.setType(type);
                 numType1.setNumList(numList);

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

@@ -286,26 +286,27 @@ public class DataService implements IDataService {
         int rule = Dateutils.DAY;
         switch (type){
             case 0 :
-                proList = dataMapper.sceneGroupBy("t_scene_pro",dayFormat,startTime,endTime,userIds);
-                plusList = dataMapper.sceneGroupBy("t_scene_plus",dayFormat,startTime,endTime,userIds);
+                proList = dataMapper.sceneGroupBy("t_scene_pro",dayFormat,startTime,endTime,userIds,null);
+                plusList = dataMapper.sceneGroupBy("t_scene_plus",dayFormat,startTime,endTime,userIds,null);
                 proObjList = dataMapper.sceneObjGroupBy("t_scene_pro",dayFormat,startTime,endTime,userIds,null);
                 plusObjList = dataMapper.sceneObjGroupBy("t_scene_plus",dayFormat,startTime,endTime,userIds,null);
-                yzlDataList = dataMapper.sceneObjGroupBy("t_scene_plus",dayFormat,startTime,endTime,userIds,"yzl");
+                yzlDataList = dataMapper.sceneGroupBy("t_scene_plus",dayFormat,startTime,endTime,userIds,"yzl");
                 break;
             case 1 :
                 rule = Dateutils.WEEK;
-                proList = dataMapper.sceneGroupByWeek("t_scene_pro",startTime,endTime,userIds);
-                plusList = dataMapper.sceneGroupByWeek("t_scene_plus",startTime,endTime,userIds);
+                proList = dataMapper.sceneGroupByWeek("t_scene_pro",startTime,endTime,userIds,null);
+                plusList = dataMapper.sceneGroupByWeek("t_scene_plus",startTime,endTime,userIds,null);
                 proObjList = dataMapper.sceneObjGroupByWeek("t_scene_pro",startTime,endTime,userIds,null);
                 plusObjList = dataMapper.sceneObjGroupByWeek("t_scene_plus",startTime,endTime,userIds,null);
-                yzlDataList = dataMapper.sceneObjGroupByWeek("t_scene_plus",startTime,endTime,userIds,"yzl");
+                yzlDataList = dataMapper.sceneGroupByWeek("t_scene_plus",startTime,endTime,userIds,"yzl");
                 break;
             case 2 :
                 rule = Dateutils.MONTH;
-                proList = dataMapper.sceneGroupBy("t_scene_pro",mouthFormat,startTime,endTime,userIds);
-                plusList = dataMapper.sceneGroupBy("t_scene_plus",mouthFormat,startTime,endTime,userIds);
+                proList = dataMapper.sceneGroupBy("t_scene_pro",mouthFormat,startTime,endTime,userIds,null);
+                plusList = dataMapper.sceneGroupBy("t_scene_plus",mouthFormat,startTime,endTime,userIds,null);
                 proObjList = dataMapper.sceneObjGroupBy("t_scene_pro",mouthFormat,startTime,endTime,userIds,null);
-                yzlDataList = dataMapper.sceneObjGroupBy("t_scene_plus",mouthFormat,startTime,endTime,userIds,"yzl");
+                plusObjList = dataMapper.sceneObjGroupBy("t_scene_plus",mouthFormat,startTime,endTime,userIds,null);
+                yzlDataList = dataMapper.sceneGroupBy("t_scene_plus",mouthFormat,startTime,endTime,userIds,"yzl");
                 break;
         }
         HashMap<String, Long> kkMap = new HashMap<>();

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

@@ -645,30 +645,6 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     }
 
     @Override
-    public List<JySceneUserAuth> getByJyUserIdAndCaseId(Integer jyUserId, Integer authType, List<Integer> openCaseIds) {
-        LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
-        wrapper.eq(JySceneUserAuth::getAuthType,authType);
-        wrapper.isNotNull(JySceneUserAuth::getCaseId);
-        if(!openCaseIds.isEmpty()){
-            wrapper.notIn(JySceneUserAuth::getCaseId,openCaseIds);
-        }
-        return this.list(wrapper);
-    }
-
-    @Override
-    public List<JySceneUserAuth> getByJyUserIdAndNum(Integer jyUserId, Integer authType, List<String> openCaseIds) {
-        LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
-        wrapper.eq(JySceneUserAuth::getAuthType,authType);
-        wrapper.isNotNull(JySceneUserAuth::getNum);
-        if(!openCaseIds.isEmpty()){
-            wrapper.notIn(JySceneUserAuth::getNum,openCaseIds);
-        }
-        return this.list(wrapper);
-    }
-
-    @Override
     public void delByJyUserId(Integer jyUserId) {
         LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);

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

@@ -103,6 +103,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IJyMoveSceneLogService jyMoveSceneLogService;
     @Autowired
     IJySceneUploadService jySceneUploadService;
+    @Autowired
+    ICaseNumService caseNumService;
 
 
     @Override
@@ -325,18 +327,29 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 param.setUserId(jyUser.getUserId());
             }
         }
-
+        List<String> openNums = null;
+        List<String> authNumList = null;
+        HashMap<String,JySceneUserAuth> authHashMap = new HashMap<>();
+        HashMap<String,JySceneUserAuth> openHashMap = new HashMap<>();
         if(param.getSceneType() == 1){
             //List<String> openNums = jySceneAuthService.getOpenNumList();
-            List<String> openNums = jySceneAuthService.getNumListByPlatform(param.getPlatformId(),1);
+            openNums = jySceneAuthService.getNumListByPlatform(param.getPlatformId(),1);
             if(!openNums.isEmpty()){
                 param.getAuthNumList().addAll(openNums);
             }
-            List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserIdAndNum(jyUser.getId(),0,openNums);
-            if(list.size() >0){
-                List<String> numList = list.stream().filter(entity -> !(entity.getLookAuth()==0 && entity.getEditAuth() ==0)).map(JySceneUserAuth::getNum).collect(Collectors.toList());
-                param.getAuthNumList().addAll(numList);
+
+            List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
+            jySceneUserAuths.stream().filter(e ->e.getNum() != null && e.getAuthType() == 0).forEach( e-> authHashMap.put(e.getNum(),e));
+            jySceneUserAuths.stream().filter(e ->e.getNum() != null && e.getAuthType() == 1).forEach( e-> openHashMap.put(e.getNum(),e));
+
+            if(!authHashMap.isEmpty()){
+                List<String> finalOpenNums = openNums;
+                authNumList = authHashMap.keySet().stream().filter(e -> !finalOpenNums.contains(e)).collect(Collectors.toList());
+                if(!authNumList.isEmpty()){
+                    param.getAuthNumList().addAll(authNumList);
+                }
             }
+
             List<JyUserShare> jyUserShares = jyUserShareService.getByJyUserId(jyUser.getId());
             List<Integer> mainUserIds = jyUserShares.stream().map(JyUserShare::getMainJyUserId).collect(Collectors.toList());
             HashMap<Integer,Long> roleMap = new HashMap<>();
@@ -395,6 +408,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
 
         HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
+        HashMap<String, Case> mapByNumList = caseNumService.getMapByNumList(numList);
 
         for (SceneVo record : page.getRecords()) {
             if( record.getSceneType().equals("laser") ){
@@ -420,27 +434,45 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setEditAuth(true);
                 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());
-                    if(jySceneUserAuth != null  && (jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() ==1)){
+
+                JySceneUserAuth jySceneUserAuth = null;
+                if(openNums != null && openNums.contains(record.getNum())){
+                    jySceneUserAuth = openHashMap.get(record.getNum());
+                }
+                if(authNumList != null && authNumList.contains(record.getNum())){
+                    jySceneUserAuth = authHashMap.get(record.getNum());
+                }
+                if(jySceneUserAuth != null){
+                    if(jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() == 1){
                         record.setIsAuth(true);
                     }
-                    if(jySceneUserAuth != null){
-                        record.setEditAuth(jySceneUserAuth.getEditAuth() == 1);
-                        if(jySceneUserAuth.getEditAuth() == 2){
-                            record.setEditAuth(jySceneUserAuth.getEditEndTime().getTime() > new Date().getTime());
-                        }
+                    record.setEditAuth(jySceneUserAuth.getEditAuth() == 1);
+                    if(jySceneUserAuth.getEditAuth() == 2){
+                        record.setEditAuth(jySceneUserAuth.getEditEndTime().getTime() > new Date().getTime());
                     }
                 }
             }else {
                 record.setIsShare(true);
             }
             record.setType( param.getType() == null ?setSceneType(record.getSceneSource(),record.getThreeCamType(),record.getSceneType()) : param.getType());
+            if(mapByNumList.get(record.getNum() + toFusionType(record.getType())) != null){
+                record.setInCase(true);
+            }
         }
         return PageInfo.PageInfo(page);
     }
 
+    //0 四维看看，1看见场景，2 深时场景,3 三维模型,4深时obj,5深光点云，6深光mesh,7圆周率
+    private Integer toFusionType(Integer type) {
+        switch (type){
+            case 5 :return 4;
+            case 6 :return 5;
+            case 7 :return 6;
+            case 8 :return 7;
+            default: return type;
+        }
+    }
+
     private Integer setSceneType(Integer sceneSource,String threeCamType,String sceneType) {
         if(sceneSource == 3 ){
             return 1;

src/main/java/com/fdkankan/manage/util/CaseNumTypeUtil.java

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -7,6 +9,9 @@ public class CaseNumTypeUtil {
 
     //0 四维看看，1看见场景，2 深时场景,3 三维模型,4深时obj ,5深光点云，6深光obj，7第三方相机
     public static Integer getCaseNumType(String num,Integer numType){
+        if(StringUtils.isBlank(num)){
+            return null;
+        }
         String numpre = num.split("-")[0];
         switch (numpre){
             case "KK" : return 0;

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

@@ -44,6 +44,7 @@ public class SceneVo {
     private Integer platformId;
 
     private Boolean isShare = false;
+    private Boolean inCase = false;
 
     private Integer sceneSource;
 

src/main/resources/mapper/manage/DataMapper.xml

@@ -124,6 +124,12 @@
           <if test="tb == 't_scene_pro'">
               AND is_upgrade = 0
           </if>
+        <if test="threeCamType !=null and threeCamType != ''">
+            AND three_cam_type is not null
+        </if>
+        <if test="threeCamType == null">
+            AND three_cam_type is  null
+        </if>
         <if test="userIds != null and userIds.size >0">
             and user_id in
             <foreach item="userId" collection="userIds" open="(" separator="," close=")">
@@ -155,6 +161,12 @@
         <if test="tb == 't_scene_pro'">
             AND is_upgrade = 0
         </if>
+        <if test="threeCamType !=null and threeCamType != ''">
+            AND three_cam_type is not null
+        </if>
+        <if test="threeCamType == null">
+            AND three_cam_type is  null
+        </if>
         <if test="userIds != null and userIds.size >0">
             and user_id in
             <foreach item="userId" collection="userIds" open="(" separator="," close=")">

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -225,7 +225,7 @@
         from fdkk_laser.t_scene s
                  left join t_user u on s.user_id = u.id
                  left join jy_user jy on u.id = jy.user_id
-        WHERE s.deleted = 0
+        WHERE s.deleted = 0 and s.scene_source in (4,5)
 
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.title like concat ('%',#{param.sceneName},'%')