jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 7 other branches

Showing 1 changed file with 1 additions and 1 deletions

...	...	@@ -95,7 +95,7 @@
95	95	return (Math.abs(year1 - year2)+i);
96	96	}
97	97	public static Integer getAge(Date birth,Date fmDate) {
98		- if (birth == null) {
	98	+ if (birth == null \|\|null==fmDate) {
99	99	return null;
100	100	}
101	101	long m = fmDate.getTime() - birth.getTime();