修改三维搜索接口查询

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

@@ -608,8 +608,7 @@
 																WHERE
 																	s.instanceId = r.source_id
 					) AS tmp
-			HAVING
-			       1 = 1
+			  <where>
 				<if test="inputText!=null and inputText != ''">
 					(
 					tmp.code LIKE '%${inputText}%'
@@ -622,6 +621,7 @@
 				<if test="riskSourceId != null  and riskSourceId!=''">
 					AND tmp.riskSourceId = #{riskSourceId}
 				</if>
+				</where>
 			) t
 	</select>
 	<select id="retrieveAll" resultType="java.util.HashMap">
@@ -1066,8 +1066,7 @@
         f_risk_source r
         where s.instanceId = r.source_id
         ) as tmp
-        HAVING
-               1 = 1
+        <where>
             <if test="inputText!=null and inputText != ''">
                 AND (
                 tmp.code LIKE '%${inputText}%'
@@ -1080,6 +1079,7 @@
             <if test="riskSourceId != null  and riskSourceId!=''">
                 AND tmp.riskSourceId = #{riskSourceId}
             </if>
+        </where>
         LIMIT ${start},${length}
     </select>
     <select id="retrieve3AllCount" resultType="long">