Merge branch 'dev-lb' into 'dev'

feat

See merge request !233

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -1073,6 +1073,9 @@ public class RegionController extends BaseController {
                 regionList.addAll(regions);
                 gridRegions = gridRegionMapper.getAllLevelThree(regionList,wgType,wgName);
             }
+            for(GridRegion gridRegion : gridRegions){
+                gridRegion.setWgParentName(gridRegionMapper.getWgNameByCode(gridRegion.getWgParentId()));
+            }
             PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
             return AjaxResult.success(pageInfo);
         }else{
@@ -1082,6 +1085,9 @@ public class RegionController extends BaseController {
             regionList.addAll(regions);
             List<GridRegion> gridRegions = new ArrayList<>();
             gridRegions = gridRegionMapper.getAllLevelThree(regions,wgType,wgName);
+            for(GridRegion gridRegion : gridRegions){
+                gridRegion.setWgParentName(gridRegionMapper.getWgNameByCode(gridRegion.getWgParentId()));
+            }
             PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
             return AjaxResult.success(pageInfo);
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/grid/GridRegion.java

@@ -34,6 +34,13 @@ public class GridRegion implements Serializable {
      */
     private String wgParentId;
 
+    /**
+     * 上级网格名字
+     *
+     * @mbg.generated
+     */
+    private String wgParentName;
+
     /**
      * 网格面积
      *
@@ -320,6 +327,14 @@ public class GridRegion implements Serializable {
         this.position = position;
     }
 
+    public String getWgParentName() {
+        return wgParentName;
+    }
+
+    public void setWgParentName(String wgParentName) {
+        this.wgParentName = wgParentName;
+    }
+
     @Override
     public String toString() {
         return "GridRegion{" +