Skip to content

Y
yifu-mvp
Commit 0e575e63 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge branch 'MVP1.5.4' into develop

parents 65cb01d6 be408c47
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
View file @ 0e575e63
...@@ -212,6 +212,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -212,6 +212,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
if (Common.isNotNull(redisCityName)) { if (Common.isNotNull(redisCityName)) {
query.eq(TMinSalary::getCity, redisCityName); query.eq(TMinSalary::getCity, redisCityName);
} }
query.isNull(TMinSalary::getTown);
query.ne(TMinSalary::getId, data.getId()); query.ne(TMinSalary::getId, data.getId());
long res = baseMapper.selectCount(query); long res = baseMapper.selectCount(query);
...@@ -249,9 +250,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -249,9 +250,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
if (Common.isNotNull(redisTownName)) { if (Common.isNotNull(redisTownName)) {
query.eq(TMinSalary::getTown, redisTownName); query.eq(TMinSalary::getTown, redisTownName);
} }
if (Common.isEmpty(location[2])) {
query.isNull(TMinSalary::getTown);
}
query.ne(TMinSalary::getId, data.getId()); query.ne(TMinSalary::getId, data.getId());
long res = baseMapper.selectCount(query); long res = baseMapper.selectCount(query);
if (res > CommonConstants.ZERO_INT) { if (res > CommonConstants.ZERO_INT) {
......
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