|
@@ -141,8 +141,11 @@ |
|
@@ -141,8 +141,11 @@ |
141
|
<if test="params.hostIp != null && params.hostIp != ''" >
|
141
|
<if test="params.hostIp != null && params.hostIp != ''" >
|
142
|
and a.host_ip = #{params.hostIp}
|
142
|
and a.host_ip = #{params.hostIp}
|
143
|
</if>
|
143
|
</if>
|
144
|
- <if test="params.tags != null && params.tags != ''" >
|
|
|
145
|
- and instr(a.tags, #{params.tags}) > 0
|
144
|
+ <if test="params.tagsList != null && params.tagsList != ''" >
|
|
|
145
|
+ and
|
|
|
146
|
+ <foreach collection="params.tagsList" index="index" item="item" separator="and">
|
|
|
147
|
+ instr(a.tags, #{item}) > 0
|
|
|
148
|
+ </foreach>
|
146
|
</if>
|
149
|
</if>
|
147
|
</select>
|
150
|
</select>
|
148
|
|
151
|
|
|
@@ -161,9 +164,13 @@ |
|
@@ -161,9 +164,13 @@ |
161
|
<if test="params.hostIp != null && params.hostIp != ''" >
|
164
|
<if test="params.hostIp != null && params.hostIp != ''" >
|
162
|
and a.host_ip = #{params.hostIp}
|
165
|
and a.host_ip = #{params.hostIp}
|
163
|
</if>
|
166
|
</if>
|
164
|
- <if test="params.tags != null && params.tags != ''" >
|
|
|
165
|
- and instr(a.tags, #{params.tags}) > 0
|
167
|
+ <if test="params.tagsList != null && params.tagsList != ''" >
|
|
|
168
|
+ and
|
|
|
169
|
+ <foreach collection="params.tagsList" index="index" item="item" separator="and">
|
|
|
170
|
+ instr(a.tags, #{item}) > 0
|
|
|
171
|
+ </foreach>
|
166
|
</if>
|
172
|
</if>
|
|
|
173
|
+
|
167
|
order by a.create_time desc
|
174
|
order by a.create_time desc
|
168
|
limit #{startIndex},#{pageSize}
|
175
|
limit #{startIndex},#{pageSize}
|
169
|
</select>
|
176
|
</select>
|