Merge remote-tracking branch 'origin/master'

# Conflicts:
#	boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java
#	boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java

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

@@ -128,6 +128,16 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         return czrkJzdzMapper.updateHouseholdRegister(idCardList,hzCzrkJzdz);
     }
 
+    @Override
+    public List<CzrkJzdz> selectCzrkJzdzListByDeptId(List<Long> deptIdList) {
+        return czrkJzdzMapper.selectCzrkJzdzListByDeptId(deptIdList);
+    }
+
+    @Override
+    public List<CzrkJzdz> selectCzrkJzdzListByRegionId(String regionId) {
+        return czrkJzdzMapper.selectCzrkJzdzListByRegionId(regionId);
+    }
+
     /**
      * 根据czrdId查询对应的居住地址
      * @param czrkId

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

@@ -2,6 +2,7 @@ package com.boman.web.core.service.czrk;
 
 
 import com.boman.domain.CzrkJzdz;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -72,4 +73,8 @@ public interface ICzrkJzdzService {
     int updateHouseholdRegister(List<String> idCardList, CzrkJzdz hzCzrkJzdz);
 
     List<CzrkJzdz> listByCzrkId(Long czrkId);
+
+    List<CzrkJzdz> selectCzrkJzdzListByDeptId(List<Long> deptIdList);
+
+    List<CzrkJzdz> selectCzrkJzdzListByRegionId(String regionId);
 }