Merge branch 'fix/密码修改未修改过期时间' into 'develop'

Merge of fix/[人员组织]密码修改未修改过期时间 to develop

See merge request o2oa/o2oa!758

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java

@@ -71,8 +71,7 @@ class ActionChangePassword extends ActionBase {
 //				}
 			}
 			emc.beginTransaction(Person.class);
-			person.setPassword(Crypto.encrypt(wi.getNewPassword(), Config.token().getKey()));
-			person.setChangePasswordTime(new Date());
+			business.person().setPassword(person, wi.getNewPassword());
 			emc.commit();
 			Wo wo = new Wo();
 			wo.setValue(true);

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java

@@ -92,8 +92,7 @@ class ActionSetPassword extends BaseAction {
 				
 				
 				emc.beginTransaction(Person.class);
-				person.setPassword(Crypto.encrypt(newPassword, Config.token().getKey()));
-				person.setChangePasswordTime(new Date());
+				business.person().setPassword(person, wi.getNewPassword());
 				emc.commit();
 				ApplicationCache.notify(Person.class);
 				Wo wo = new Wo();