Merge remote-tracking branch 'origin/master'

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

@@ -339,6 +339,16 @@ public class CzrkServiceImpl implements ICzrkService {
         }
 
         Czrk czrk = czrkMapper.selectCzrkById(id);
+        if (czrk != null){
+            Long gridId = czrk.getGridId();
+            if (gridId != null){
+                GridInfo gridInfo = gridInfoMapper.selectGridInfoById(gridId);
+                if (gridInfo != null){
+                    String areaName = gridInfo.getAreaName();
+                    czrk.setGridName(areaName);
+                }
+            }
+        }
         List<CzrkJzdz> czrkJzdzList = czrkJzdzService.listByIdCard(Collections.singletonList(czrk.getIdCard()));
         czrk.setCzrkJzdzList(czrkJzdzList);
         return czrk;