Skip to content

Y
yichengstreet-be
Commit 9b2b7cc3 authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

Dev lb

See merge request !51
parents 71ea5c05 988e416b
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 @ 9b2b7cc3
...@@ -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