Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -80,26 +80,26 @@ public class CzrkServiceImpl implements ICzrkService {
         setAgeScope(czrk);
 
         // 去查jzdz表
-//        if (Czrk.CZ.equals(czrk.getQueryType())) {
-//            CzrkJzdz czrkJzdz = new CzrkJzdz();
-//            Long provinceId = czrk.getProvinceIdXjd();
-//            Long cityId = czrk.getCityIdXjd();
-//            Long regionId = czrk.getRegionIdXjd();
-//            Long villageTownsId = czrk.getVillageTownsIdXjd();
-//            Long villageId = czrk.getVillageIdXjd();
-//            if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
-//                czrk.setIdCardList(null);
-//            } else {
-//                czrkJzdz.setProvinceId(provinceId);
-//                czrkJzdz.setCityId(cityId);
-//                czrkJzdz.setRegionId(regionId);
-//                czrkJzdz.setTownId(villageTownsId);
-//                czrkJzdz.setVillageId(villageId);
-//                startPage();
-//                List<String> idCardList = czrkJzdzService.listIdCard(czrkJzdz);
-//                czrk.setIdCardList(idCardList);
-//            }
-//        }
+        if (Czrk.CZ.equals(czrk.getQueryType())) {
+            CzrkJzdz czrkJzdz = new CzrkJzdz();
+            Long provinceId = czrk.getProvinceIdXjd();
+            Long cityId = czrk.getCityIdXjd();
+            Long regionId = czrk.getRegionIdXjd();
+            Long villageTownsId = czrk.getVillageTownsIdXjd();
+            Long villageId = czrk.getVillageIdXjd();
+            if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
+                czrk.setIdCardList(null);
+            } else {
+                czrkJzdz.setProvinceId(provinceId);
+                czrkJzdz.setCityId(cityId);
+                czrkJzdz.setRegionId(regionId);
+                czrkJzdz.setTownId(villageTownsId);
+                czrkJzdz.setVillageId(villageId);
+                startPage();
+                List<String> idCardList = czrkJzdzService.listIdCard(czrkJzdz);
+                czrk.setIdCardList(idCardList);
+            }
+        }
 
         startPage();
 //        List<Czrk> czrks = czrkMapper.listByRlryRel(czrk);

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

@@ -867,7 +867,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectDeptNameById" parameterType="Integer" resultMap="SysDeptResult">
+    <select id="selectDeptNameById" parameterType="Long" resultMap="SysDeptResult">
         select *  from sys_dept where id = #{id} limit 1;
     </select>
 </mapper>