Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r40748 -r40752
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 40748)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 40752)
@@ -795,6 +795,10 @@
 			if(!userManager.forceUserChangePwdWhenNotMeetPwdComplexityReq(user.getName(), username, password)){
 				return JSONUtil.buildErrorMsgJsonResult("密码不符合复杂度要求，请在PC端登录修改为符合要求的密码后再进行登录！");
 			}
+			//新增强制用户定期修改登录密码功能QYSRMYY-76
+			if(sysUserManager.userPasswdIsExpired(user, new Date())){
+				return JSONUtil.buildErrorMsgJsonResult("当前用户密码已经超过时限，请到PC端修改密码。");
+			}
 		}
 		return userToJson2(user);
 	}