Merge branch 'dev' into 'master'

小区建成年代没有修改为返回空

See merge request !805
This commit is contained in:
2024-02-05 14:54:04 +08:00
@@ -2747,11 +2747,14 @@ public class DistrictServiceImpl implements DistrictService {
public Integer getCreateYear(District district) {
Integer buildYear = getYearFormDate(district.getCreateYear());
int minYear = Integer.MAX_VALUE;
if (buildYear != null && buildYear < minYear) {
minYear = buildYear;
// int minYear = Integer.MAX_VALUE;
if (buildYear != null && buildYear < Integer.MAX_VALUE) {
// minYear = buildYear;
return buildYear;
}else {
return null;
}
return minYear;
// return minYear;
}
public Integer getBuildYear(District district) {