Merge branch 'dev' into 'main'

Dev

See merge request !106

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

@@ -571,12 +571,12 @@ 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("2");
+        criteria.andUserIdEqualTo(user.getUserId());
+//        criteria.andUserIdEqualTo("2");
         criteria.andIsValidEqualTo("1");
         List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
         String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));