pipIrr-SV.git - Gitblit

			@@ -249,8 +249,8 @@
			AND divi.name LIKE CONCAT('%',#{divideName},'%')
			</if>

			<if test = "blockName != null and blockName !=''">
			AND blo.name = #{blockName}
			<if test = "blockId != null and blockId !=''">
			AND divi.blockId = #{blockId}
			</if>
			</where>
			</select>
			@@ -261,10 +261,17 @@
			(@i:=@i+1) AS id,
			CAST(divi.id AS char) AS divideId,
			divi.name AS divideName,
			CAST(divi.blockId AS char) AS blockId,
			blo.`name` AS blockName,
			divi.header,
			divi.villages,
			divi.area,
			divi.lng,
			divi.lat,
			divi.phone,
			divi.remarks,
			CONCAT(country.`name`, town.`name`, village.`name`) AS address,
			CAST(divi.operator AS char) AS operator,
			divi.operateDt
			FROM pr_divide divi
			INNER JOIN ba_block blo ON divi.blockId = blo.id
			@@ -278,14 +285,16 @@
			AND divi.name LIKE CONCAT('%',#{divideName},'%')
			</if>

			<if test = "blockName != null and blockName !=''">
			AND blo.name = #{blockName}
			<if test = "blockId != null">
			AND divi.blockId = #{blockId}
			</if>
			</where>
			ORDER BY divi.operateDt DESC
			<if test="pageCurr != null and pageSize != null">
			LIMIT ${pageCurr}, ${pageSize}
			</if>
			<trim prefix="limit " >
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			</if>
			</trim>
			</select>

			<!--根据分水房ID逻辑删除分水房-->
			@@ -300,7 +309,7 @@

			<!--根据分水房编号获取所属片区编号-->
			<select id="getBlockIdById" resultType="java.lang.Long">
			SELECT blockId FROM pr_divide WHERE id = ${divideId}}
			SELECT blockId FROM pr_divide WHERE id = ${divideId}
			</select>

			</mapper>