Merge branch 'master' of e.coding.net:tsteam/urban-governance/common-population

src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml

@@ -193,6 +193,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/aids/aids-mapper.xml

@@ -187,6 +187,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml

@@ -308,6 +308,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml

@@ -177,6 +177,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/homeperson/homeperson-mapper.xml

@@ -214,6 +214,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/keyteenagers/keyteenagers-mapper.xml

@@ -218,6 +218,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml

@@ -231,6 +231,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/overseaspersonnel/overseaspersonnel-mapper.xml

@@ -245,6 +245,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY gmt_create DESC
     </select>
 

src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml

@@ -214,6 +214,9 @@
         <if test="areaCodeLike != null and areaCodeLike != ''">
             AND t1.area_code LIKE CONCAT(#{areaCodeLike}, '%')
         </if>
+        <if test="gridId != null and gridId != ''">
+            AND t1.grid_id = #{gridId}
+        </if>
         ORDER BY gmt_create DESC
     </select>