fix

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

@@ -581,13 +581,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("1");
+//        criteria.andUserIdEqualTo("1");
 
         criteria.andIsValidEqualTo("1");
         List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
@@ -974,7 +974,6 @@ public class RegionController extends BaseController {
         //需要两个数组，index_now记录当前传入数组的channelId在数据库中的position
         //此处为了考虑按照类型分类后产生的不完整排序
         int[] index_now = new int[list.size()];
-//        System.out.println(Arrays.toString(index_now));
 
         for(int i = 0; i < list.size(); i++){
             String channelId = list.get(i);
@@ -982,7 +981,6 @@ public class RegionController extends BaseController {
             index_now[i] = position_now;
         }
         Arrays.sort(index_now);
-//        System.out.println(Arrays.toString(index_now));
 
         for(int i = 0;i<list.size();i++){
             gridRegionMapper.position(list.get(i),index_now[i]);
@@ -991,4 +989,10 @@ public class RegionController extends BaseController {
         return AjaxResult.success();
     }
 
+//    @RequestMapping(value = "/exchangePosition", method = RequestMethod.GET)
+//    @ResponseBody
+//    public AjaxResult exchangePosition(@RequestParam("first") String first,@RequestParam("second") String second) {
+//        return AjaxResult.success(gridRegionMapper.getFourRegionList(wgCode));
+//    }
+
 }