From 76f089a33e7c920c15d7e17e68e46febe3acee25 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 19 Feb 2022 20:20:14 +0800
Subject: [PATCH] ChangePassword

---
 .../src/main/java/org/maxkey/entity/ChangePassword.java   | 8 ++++++++
 .../org/maxkey/persistence/service/UserInfoService.java   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java
index 5b0ccd51f..666e94bdd 100644
--- a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java
+++ b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java
@@ -38,6 +38,7 @@ public class ChangePassword extends JpaBaseEntity{
 	private String password;
 	private String confirmpassword;
 	private String decipherable;
+	private String instId;
 	
 	/**
 	 * 
@@ -208,6 +209,13 @@ public class ChangePassword extends JpaBaseEntity{
 		this.employeeNumber = employeeNumber;
 	}
 
+	public String getInstId() {
+		return instId;
+	}
+
+	public void setInstId(String instId) {
+		this.instId = instId;
+	}
 
 	@Override
     public String toString() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
index 476a7e9ed..394528dd1 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
@@ -313,7 +313,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 	}
 	
 	public void changePasswordProvisioning(UserInfo userInfo) {
-	    if(userInfo.getPassword()!=null && !userInfo.getPassword().equals("")) {
+	    if(StringUtils.isNotBlank(userInfo.getPassword())) {
 	    	UserInfo loadUserInfo = findByUsername(userInfo.getUsername());
     	    ChangePassword changePassword=new ChangePassword();
             changePassword.setId(loadUserInfo.getId());
@@ -325,7 +325,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
             changePassword.setEmployeeNumber(loadUserInfo.getEmployeeNumber());
             changePassword.setDecipherable(loadUserInfo.getDecipherable());
             changePassword.setPassword(loadUserInfo.getPassword());
-            
+            changePassword.setInstId(loadUserInfo.getInstId());
             kafkaPersistService.send(
                     KafkaIdentityTopic.PASSWORD_TOPIC, 
                     changePassword,