Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !118

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

@@ -69,13 +69,13 @@ public class RegionController extends BaseController {
                        @RequestParam("pageSize") Integer pageSize) {
         try {
             AjaxResult result = new AjaxResult();
-//            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("8c48c6cab96e462a9632492762c4cfaa");
+//            criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
             criteria.andIsValidEqualTo("1");
 
             List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
@@ -575,13 +575,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("8c48c6cab96e462a9632492762c4cfaa");
+//        criteria.andUserIdEqualTo("2");
 
         criteria.andIsValidEqualTo("1");
         List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
@@ -817,13 +817,13 @@ public class RegionController extends BaseController {
             List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
             return AjaxResult.success(gridRegionList);
         }
-//        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("8c48c6cab96e462a9632492762c4cfaa");
+//                criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
 
         criteria.andIsValidEqualTo("1");
         List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);