Merge branch 'dev' into 'main'

Dev

See merge request !196

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

@@ -581,13 +581,13 @@ public class RegionController extends BaseController {
     @RequestMapping(value = "/getWsTreeNode", method = RequestMethod.GET)
     @ResponseBody
     public AjaxResult getWsTreeNode(@RequestParam("wgType") String wgType, String isShow, @RequestParam(value = "isAll", required = false) String isAll) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
         //网格
         GridRegionUserExample example = new GridRegionUserExample();
         GridRegionUserExample.Criteria criteria = example.createCriteria();
-        criteria.andUserIdEqualTo(user.getUserId());
+//        criteria.andUserIdEqualTo(user.getUserId());
 
-//        criteria.andUserIdEqualTo("2");
+        criteria.andUserIdEqualTo("1");
 
         criteria.andIsValidEqualTo("1");
         List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -1236,7 +1236,7 @@ public class GridRegionFacadeService {
             secondFiveTreeNode1.setLevel("2.5");
             GridTreeNode secondFiveTreeNode4 = new GridTreeNode();
             secondFiveTreeNode4.setId(UUID.randomUUID().toString());
-            secondFiveTreeNode4.setName("道路");
+            secondFiveTreeNode4.setName("道路（门店）");
             secondFiveTreeNode4.setChild(new ArrayList<>());
             secondFiveTreeNode4.setStatus("2");
             secondFiveTreeNode4.setLevel("2.5");
@@ -1268,7 +1268,7 @@ public class GridRegionFacadeService {
                 String type = null;
                 if(gridTreeNode1.getName().equals("楼宇")){
                     type = "1";
-                }else if(gridTreeNode1.getName().equals("道路")){
+                }else if(gridTreeNode1.getName().equals("道路（门店）")){
                     type = "4";
                 }else if(gridTreeNode1.getName().equals("街区")){
                     type = "5";