Skip to content

Y
yichengstreet-be
Commit 1adafa52 authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

Dev lb

See merge request !118
parents 2d2e0d9e 4ee06daf
Pipeline #143177 passed with stages
      in 7 minutes and 13 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 9 additions and 9 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ 1adafa52
      ...@@ -69,13 +69,13 @@ public class RegionController extends BaseController { ...@@ -69,13 +69,13 @@ public class RegionController extends BaseController {
      @RequestParam("pageSize") Integer pageSize) { @RequestParam("pageSize") Integer pageSize) {
      try { try {
      AjaxResult result = new AjaxResult(); AjaxResult result = new AjaxResult();
      // SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
      //网格 //网格
      GridRegionUserExample example = new GridRegionUserExample(); GridRegionUserExample example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria(); GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId()); criteria.andUserIdEqualTo(user.getUserId());
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa"); // criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
      criteria.andIsValidEqualTo("1"); criteria.andIsValidEqualTo("1");
      List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example); List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
      ...@@ -575,13 +575,13 @@ public class RegionController extends BaseController { ...@@ -575,13 +575,13 @@ public class RegionController extends BaseController {
      @RequestMapping(value = "/getWsTreeNode", method = RequestMethod.GET) @RequestMapping(value = "/getWsTreeNode", method = RequestMethod.GET)
      @ResponseBody @ResponseBody
      public AjaxResult getWsTreeNode(@RequestParam("wgType") String wgType, String isShow, @RequestParam(value = "isAll", required = false) String isAll) { 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 example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria(); GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId()); criteria.andUserIdEqualTo(user.getUserId());
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa"); // criteria.andUserIdEqualTo("2");
      criteria.andIsValidEqualTo("1"); criteria.andIsValidEqualTo("1");
      List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example); List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
      ...@@ -817,13 +817,13 @@ public class RegionController extends BaseController { ...@@ -817,13 +817,13 @@ public class RegionController extends BaseController {
      List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example); List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
      return AjaxResult.success(gridRegionList); return AjaxResult.success(gridRegionList);
      } }
      // SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
      //网格 //网格
      GridRegionUserExample example = new GridRegionUserExample(); GridRegionUserExample example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria(); GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId()); criteria.andUserIdEqualTo(user.getUserId());
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa"); // criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
      criteria.andIsValidEqualTo("1"); criteria.andIsValidEqualTo("1");
      List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example); List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment