统计字段修改

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

@@ -640,7 +640,7 @@ public class CzrkServiceImpl implements ICzrkService {
     /**
      * 2022/3/24修改的根据czrkId查询该用户信息
      *
-     * @param id
+     * @param
      * @return
      */
     @Override
@@ -652,7 +652,8 @@ public class CzrkServiceImpl implements ICzrkService {
     public List<Czrk> getAllCzrk(Czrk czrk) {
         setAgeScope(czrk);
         List<Czrk> czrkList = czrkMapper.getAllCzrk(czrk);
-        packAddr(czrkList);
+        CzrkUtils.packAddr(czrkList);
+        //packAddr(czrkList);
         return czrkList;
     }
 
@@ -1296,7 +1297,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
         //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
         for (Czrk czrk : czrkList) {
-            if(!(czrk.getVillageTownsId() == null) && !(czrk.getVillageTownsId().longValue() == 0)  && String.valueOf(czrk.getVillageTownsId()).equals(areaId)){
+            if(StringUtils.isNotEmpty(czrk.getVillageTownsId()) && String.valueOf(czrk.getVillageTownsId()).equals(areaId)){
                 if("N".equals(czrk.getIsDel())){
                     hjzrs++;
                 }