|
@@ -80,8 +80,9 @@
|
|
|
<result property="villagerGroupJz" column="villagerGroupJz"/>
|
|
|
<result property="gridNameJz" column="gridNameJz"/>
|
|
|
|
|
|
-
|
|
|
<collection property="czrkJzdzList" javaType="java.util.List" resultMap="CzrkJzdzResult"/>
|
|
|
+
|
|
|
+
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="com.boman.domain.CzrkJzdz" id="CzrkJzdzResult">
|
|
@@ -168,7 +169,14 @@
|
|
|
|
|
|
<if test="isConfirm != null and isConfirm != ''">and is_confirm = #{isConfirm}</if>
|
|
|
<if test="gridId != null and gridId != ''">and grid_id = #{gridId}</if>
|
|
|
- <if test="keyCategory != null and keyCategory != ''">and find_in_set(#{keyCategory}, key_category)</if>
|
|
|
+
|
|
|
+ <if test="keyCategoryList != null and keyCategoryList.size() > 0">
|
|
|
+ <foreach item="KeyCategory" collection="keyCategoryList">
|
|
|
+ and find_in_set(#{KeyCategory}, key_category)
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+
|
|
|
+
|
|
|
</where>
|
|
|
order by create_time DESC
|
|
|
</select>
|
|
@@ -207,7 +215,11 @@
|
|
|
<if test="villagerGroupIdJz != null and villagerGroupIdJz != ''">and z.villager_group_id = #{villagerGroupIdJz}</if>
|
|
|
<if test="gridIdJz != null and gridIdJz != ''">and z.grid_id = #{gridIdJz}</if>
|
|
|
|
|
|
- <if test="keyCategory != null and keyCategory != ''">and find_in_set(#{keyCategory}, key_category)</if>
|
|
|
+ <if test="keyCategoryList != null and keyCategoryList.size() > 0">
|
|
|
+ <foreach item="KeyCategory" collection="keyCategoryList">
|
|
|
+ and find_in_set(#{KeyCategory}, key_category)
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
</where>
|
|
|
order by c.create_time DESC
|
|
|
</select>
|