Merge branch 'MVP1.5.4' into develop

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java

@@ -212,6 +212,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 											if (Common.isNotNull(redisCityName)) {
 												query.eq(TMinSalary::getCity, redisCityName);
 											}
+											query.isNull(TMinSalary::getTown);
 											query.ne(TMinSalary::getId, data.getId());
 											long res = baseMapper.selectCount(query);
 
@@ -249,9 +250,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 											if (Common.isNotNull(redisTownName)) {
 												query.eq(TMinSalary::getTown, redisTownName);
 											}
-											if (Common.isEmpty(location[2])) {
-												query.isNull(TMinSalary::getTown);
-											}
 											query.ne(TMinSalary::getId, data.getId());
 											long res = baseMapper.selectCount(query);
 											if (res > CommonConstants.ZERO_INT) {