Merge branch 'dev' into 'main'

Dev

See merge request !139

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

@@ -316,7 +316,7 @@ public class GridRegionFacadeService {
 //        appPageModel.setRecordCount(res.size());
         appPageModel.setRecordCount(count);
         appPageModel.setPageCount((long) Math.ceil(1.0 * count / pageSize));
-        if(level.equals("3")){
+        if(level!=null && level.equals("3")){
             for(GridRegion role : roles) {
                 String type = role.getWgType();
                 String code = role.getWgParentId();