导出没有填写村级的数据

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

@@ -1545,12 +1545,10 @@ public class CzrkServiceImpl implements ICzrkService {
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         setQueryRole(czrk, sysUser, Czrk.HJ);
 
-        if(StringUtils.isEmpty(czrk.getVillageTownsId())){
-            throw new BaseException("请选择要导出的镇户籍地址");
-        }
+
         List<Czrk> czrkList = czrkMapper.getAllCzrkHjVillage(czrk);
 
-        return null;
+        return czrkList;
     }
 
 

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

@@ -1289,7 +1289,7 @@
             <if test="cityId != null  and cityId != ''">and c.city_id = #{cityId}</if>
             <if test="regionId != null  and regionId != ''">and c.region_id = #{regionId}</if>
             <if test="villageTownsId != null  and villageTownsId != ''">and c.village_towns_id = #{villageTownsId}</if>
-            and (c.village_id = '' or c.village_id = '0')
+            and (c.village_id = '' or c.village_id = '0' or c.village_id is null)
         </where>
         order by c.code ,c.house_type desc,c.id_card;
     </select>