Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !165

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("1");
+//            criteria.andUserIdEqualTo("1");
             criteria.andIsValidEqualTo("1");
 
             List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);