Skip to content

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

Merge branch 'dev' into 'main' 

Dev

See merge request !194
parents 1a554086 e035aea7
Pipeline #143648 canceled with stages
      in 6 minutes and 11 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 3 additions and 3 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ f2e1889a
      ...@@ -66,13 +66,13 @@ public class RegionController extends BaseController { ...@@ -66,13 +66,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("1"); // criteria.andUserIdEqualTo("1");
      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