修改三维资源搜索脚本

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -589,7 +589,7 @@
 							<if test="type!=null and type!=''">
 								AND tmp.typeCode = #{type}
 							</if>
-							<if test="riskSourceId != null">
+							<if test="riskSourceId != null and riskSourceId!=''">
 								AND tmp.riskSourceId = #{riskSourceId}
 							</if>
 					</where>
@@ -823,7 +823,7 @@
 		left join wl_equipment_category as cat on equ.category_id = cat.id
 		left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
-		where   substr(cat.code ,1,4)= '3105' and str.source_id is not null
+		where   substr(cat.code ,1,4)= '3105'
 		UNION all
 		select
 		concat('pool-',s.instanceId) as id,
@@ -942,7 +942,7 @@
 		left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
 		left join f_risk_source as risk on str.source_id = risk.source_id
-		where   substr(cat.code ,1,4) = '3104' and risk.source_id is not null
+		where   substr(cat.code ,1,4) = '3104'
 		UNION all
 		select
 		concat('fireChamber-',s.instanceId) as id,
@@ -1049,7 +1049,7 @@
             <if test="type!=null and type!=''">
                 AND tmp.typeCode = #{type}
             </if>
-            <if test="riskSourceId != null">
+            <if test="riskSourceId != null  and riskSourceId!=''">
                 AND tmp.riskSourceId = #{riskSourceId}
             </if>
         </where>