1 大屏界面 全局搜索优化

zh-baseversion-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -119,7 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a2.detector_type,
             a2.detector_status FROM t_detector_user a1
             LEFT JOIN t_detector_info a2 ON a1.user_id = a2.user_id  AND a2.is_del = '0'
-            where a1.is_del = '0' and a1.longitude is not null and a1.latitude is not null) a
+            where a1.is_del = '0'
+            <if test="name != null  and name != ''"> and a1.nick_name like concat('%', #{name}, '%')</if>
+            and a1.longitude is not null and a1.latitude is not null) a
             group by a.user_id,a.detector_type
 
             ) t1 left join (
@@ -135,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where b2.is_del = '0' and b3.is_del = '0'  ) b
             group by b.user_id,b.detector_type
 
-            ) t2 on t2.userId = t1.userId <if test="name != null  and name != ''"> where t1.nickName like concat('%', #{name}, '%')</if>  UNION
+            ) t2 on t2.userId = t1.userId  UNION
 
         SELECT
             video_manager_id AS id,