Skip to content

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

Merge branch 'dev' into 'main' 

Dev

See merge request !52
parents ea74acf9 9b2b7cc3
Pipeline #142976 passed with stages
        in 3 minutes and 34 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 1 deletion
        ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
        View file @ 40fd5f63
        ...@@ -856,7 +856,8 @@ public class GridRegionFacadeService { ...@@ -856,7 +856,8 @@ public class GridRegionFacadeService {
        criteria.andWgNameLike("%" + wgName + "%"); criteria.andWgNameLike("%" + wgName + "%");
        } }
        if (StringUtils.isNotEmpty(wgCode)) { if (StringUtils.isNotEmpty(wgCode)) {
        criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("4"); // criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("4");
        criteria.andWgCodeLike(wgCode + "%").andLevelEqualTo("2").andWgTypeEqualTo("1");
        } }
        try { try {
        int count = gridRegionService.countByExample(example); int count = gridRegionService.countByExample(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