pipIrr-SV.git - Gitblit

			@@ -238,13 +238,13 @@
			SELECT
			COUNT(*) AS recordCount
			FROM pr_divide divi
			<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
			INNER JOIN ba_district country ON divi.countyId = country.id
			INNER JOIN ba_district town ON divi.townId = town.id
			INNER JOIN ba_district village ON divi.villageid = village.id
			INNER JOIN ba_block blo ON divi.blockId = blo.id
			Left JOIN ba_district country ON divi.countyId = country.id
			Left JOIN ba_district town ON divi.townId = town.id
			Left JOIN ba_district village ON divi.villageid = village.id
			, (SELECT @i:=0) AS itable
			<where>
			AND divi. deleted = 0
			divi. deleted = 0
			<if test = "divideName != null and divideName !=''">
			AND divi.name LIKE CONCAT('%',#{divideName},'%')
			</if>
			@@ -262,7 +262,7 @@
			CAST(divi.id AS char) AS divideId,
			divi.name AS divideName,
			CAST(divi.blockId AS char) AS blockId,
			<!-- blo.`name` AS blockName,-->
			blo.`name` AS blockName,
			divi.header,
			divi.villages,
			divi.area,
			@@ -274,13 +274,13 @@
			CAST(divi.operator AS char) AS operator,
			divi.operateDt
			FROM pr_divide divi
			<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
			INNER JOIN ba_district country ON divi.countyId = country.id
			INNER JOIN ba_district town ON divi.townId = town.id
			INNER JOIN ba_district village ON divi.villageid = village.id
			INNER JOIN ba_block blo ON divi.blockId = blo.id
			Left JOIN ba_district country ON divi.countyId = country.id
			Left JOIN ba_district town ON divi.townId = town.id
			Left JOIN ba_district village ON divi.villageid = village.id
			, (SELECT @i:=0) AS itable
			<where>
			AND divi. deleted = 0
			divi. deleted = 0
			<if test = "divideName != null and divideName !=''">
			AND divi.name LIKE CONCAT('%',#{divideName},'%')
			</if>