1

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

@@ -174,6 +174,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 param.setFolderNoInNums(collect);
             }
         }
+        if(param.getType() != null &&( param.getType() == 2 || param.getType() == 5 || param.getType() == 57)){
+            param.setIsLaserScene(1);
+        }
 
 
         Page<SceneVo> page  = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);

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

@@ -44,4 +44,6 @@ public class SceneParam extends RequestBase {
     private Integer folderId;
     private List<Integer> folderIdList;
 
+    private Integer isLaserScene = 0;
+
 }

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

@@ -25,6 +25,9 @@
         <if test="param.companyName !=null and param.companyName !='' ">
             and co.company_name like concat ('%',#{param.companyName},'%')
         </if>
+        <if test="param.sceneName != null and param.sceneName!='' ">
+            and f.name like  concat ('%',#{param.sceneName},'%')
+        </if>
     </sql>
     <select id="pageListFolder" resultType="com.fdkankan.manage_jp.vo.response.SceneVo">
         <include refid="folderSelect"></include>
@@ -50,8 +53,11 @@
         ,2 as sort_order,0 as isFolder
         from t_scene_pro s
         <include refid="commonWhere"></include>
-        <if test="param.sceneName != null and param.sceneName!='' ">
-            and (s.scene_name like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
+        <if test="param.isLaserScene ==0 and param.sceneName != null and param.sceneName!='' ">
+            and s.scene_name like concat ('%',#{param.sceneName},'%')
+        </if>
+        <if test="param.isLaserScene ==1 and param.sceneName != null and param.sceneName!='' ">
+            and s.laser_title like concat ('%',#{param.sceneName},'%')
         </if>
         <if test="param.status != null  ">
             and s.status = #{param.status}
@@ -65,8 +71,11 @@
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>
-        <if test="param.sceneName != null and param.sceneName!='' ">
-            and (s.title like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
+        <if test="param.isLaserScene ==0 and param.sceneName != null and param.sceneName!='' ">
+            and s.scene_name like concat ('%',#{param.sceneName},'%')
+        </if>
+        <if test="param.isLaserScene ==1 and param.sceneName != null and param.sceneName!='' ">
+            and s.laser_title like concat ('%',#{param.sceneName},'%')
         </if>
         <if test="param.status != null  ">
             and s.scene_status = #{param.status}