Merge branch 'dev' into 'main'

Dev

See merge request !164

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

@@ -69,23 +69,32 @@ 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);
             String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
             List<String> regions = Arrays.asList(region.split(","));
             List<String> regionList = new ArrayList<>();
-            if(!regions.get(0).equals("320282001")){
+
+//            if(!regions.get(0).equals("320282001")){
+//                regionList.add("320282001");
+//            }
+//            regionList.addAll(regions);
+
+            //3.20权限bug
+            if(regions.get(0).equals("320282001")){
                 regionList.add("320282001");
+            }else{
+                regionList.addAll(regions);
             }
-            regionList.addAll(regions);
+            //
 
 
             if(wgType.equals("0")){

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -285,6 +285,14 @@ public class GridRegionFacadeService {
             }
         }
 
+        //3.20权限bug
+        if(regions != null && !regions.isEmpty()) {
+            for (String regionId : regions) {
+                criteria.andWgCodeLike(regionId + "%");
+            }
+        }
+        //
+
         int count = gridRegionService.countByExample(example);
         if (count <= 0) {
             result.buildSuccess("success", appPageModel);