Merge branch 'dev' into 'main'

Dev

See merge request !147

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

@@ -906,4 +906,12 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionMapper.selectByExample(example1));
     }
 
+    @RequestMapping(value = "/changeNameByCode",method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult changeNameByCode(@RequestParam(value = "id", required = false) String id,
+                                 @RequestParam(value = "name", required = false) String name
+    ){
+        return AjaxResult.success(gridRegionMapper.changeTreeNodeNameByCode(id,name));
+    }
+
 }

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

@@ -63,4 +63,6 @@ public interface GridRegionMapper {
     String getWgCodeById(String id);
 
     List<GridRegion> selectAllByIdAndWgType(@Param("wgType")String wgType, @Param("wgCode")String wgCode);
+
+    int changeTreeNodeNameByCode(@Param("code") String code, @Param("name") String name);
 }
\ No newline at end of file

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

@@ -712,5 +712,8 @@
   <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
   </update>
+    <update id="changeTreeNodeNameByCode">
+      update grid_region set wg_name=#{name} where wg_code = #{code}
+    </update>
 
 </mapper>
\ No newline at end of file