Index: ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
===================================================================
diff -u -r30425 -r30426
--- ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java	(.../DaoUserDetailSSTSImpl.java)	(revision 30425)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java	(.../DaoUserDetailSSTSImpl.java)	(revision 30426)
@@ -319,7 +319,7 @@
 				}
 			}
 			//处理深圳三院单点登录配置导致密码未传完后台的情况
-			if(StringUtils.isNotBlank(j_password) || StringUtils.equals(RSAEncrypt.decrypt(j_password), barcodeLogonPassword)){
+			if(StringUtils.isNotBlank(j_password) && StringUtils.equals(RSAEncrypt.decrypt(j_password), barcodeLogonPassword)){
 				password = CoderEncryption.encryptMD5ForSpringSecurity(j_password);
 			}
 		}else{