Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !130

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

@@ -895,9 +895,13 @@ public class RegionController extends BaseController {
         if(id==null || id.isEmpty()){
             return AjaxResult.success();
         }
+        String code = gridRegionMapper.getWgCodeById(id);
+        if(code == null){
+            return AjaxResult.success("id不存在");
+        }
         GridRegionExample example1 = new GridRegionExample();
         GridRegionExample.Criteria criteria1 = example1.createCriteria();
-        criteria1.andWgParentIdEqualTo("id");
+        criteria1.andWgParentIdEqualTo(code);
         criteria1.andWgTypeEqualTo(wgType);
         return AjaxResult.success(gridRegionMapper.selectByExample(example1));
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -59,4 +59,6 @@ public interface GridRegionMapper {
     int changeTreeNodeName(@Param("id") String id, @Param("name") String name);
 
     List<GridRegion> getAllLevelTwoByType(@Param("wgCodeLikes")List<String> wgCodeLikes);
+
+    String getWgCodeById(String id);
 }
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -698,8 +698,11 @@
       </if>
       and level = 2
     </select>
+  <select id="getWgCodeById" resultType="java.lang.String">
+    select wg_code from grid_region where id = #{id}
+  </select>
 
-    <update id="changeTreeNodeName">
+  <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
   </update>