Merge remote-tracking branch 'origin/master'

# Conflicts:
#	boman-web-core/src/main/resources/mapper/CzrkMapper.xml

boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml

@@ -293,4 +293,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCzrkJzdzListPage" parameterType="Integer" resultMap="CzrkJzdzResult">
         select * from czrk_jzdz where village_id = '' and  now_in != ''  limit   #{startNum}, #{endNum}
     </select>
+
+    <select id="selectCzrkJzdzListByDeptId" resultMap="CzrkJzdzResult">
+        select id, dept_id, create_time, status from czrk_jzdz
+        where 1=1
+        <if test="deptIdList != null  and deptIdList.size() > 0">
+            and dept_id in
+            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+    </select>
+    <select id="selectCzrkJzdzListByRegionId" resultMap="CzrkJzdzResult">
+        elect id, dept_id, region_id, region, town_id, town, village_id, village create_time, status
+        from czrk_jzdz
+        where region_id = #{regionId};
+    </select>
 </mapper>

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -1224,4 +1224,19 @@
         </where>
         order by create_time DESC
     </select>
+    <select id="selectCzrkListByDeptId" resultMap="CzrkResult">
+        select id, dept_id, create_time, is_del from czrk
+        where 1=1
+        <if test="deptIdList != null  and deptIdList.size() > 0">
+            and dept_id in
+            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+    </select>
+    <select id="getAllCzrkRegionId" resultMap="CzrkResult">
+        select id, dept_id, region_id, region, village_towns_id, village_towns
+                 , village_id, village create_time, is_del, area_id from czrk
+        where region_id = #{regionId};
+    </select>
 </mapper>