Merge branch 'dev-lb' into 'dev'

Dev lb See merge request !51

Merge branch 'dev-lb' into 'dev'
Dev lb See merge request !51
9b2b7cc3 · luben · 71ea5c05 · 988e416b · 9b2b7cc3
Commit 9b2b7cc3 authored Mar 07, 2025 by luben
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

GridRegionFacadeService.java ...om/ruoyi/system/service/grid/GridRegionFacadeService.java +2 -1

No files found.
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
@@ -856,7 +856,8 @@ public class GridRegionFacadeService {
            criteria.andWgNameLike("%" + wgName + "%");
        }
        if (StringUtils.isNotEmpty(wgCode)) {
-            criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("4");
+//            criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("4");
+            criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("2").andWgTypeEqualTo("1");
        }
        try {
            int count = gridRegionService.countByExample(example);