Revert "Revert "bug fix""

This reverts commit 67e51a17d1f13d4cb545dcb9e2f9530d0b52cb67.

Conflicts:
	src/main/java/innovation/service/UserService.java
	src/main/java/innovation/service/impl/UserServiceImpl.java
	src/main/resources/conf/spring.xml
	src/main/webapp/WEB-INF/web.xml
bug fix
bug fix
bug fix
bug fix
check again
work check and update
merge fix