Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r37658 -r37659
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 37658)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 37659)
@@ -23,10 +23,10 @@
 		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
 
 		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else if(windowsPasswordComplexityReq){
+		if(windowsPasswordComplexityReq){
 			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
+		}else if(passwordComplexityReq1){
+			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
 		}else {
 			if(containUppercaseLetter && containLowerCaseLetter){
 				msg += '，需要包含大小写字母';
Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r37658 -r37659
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 37658)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 37659)
@@ -84,10 +84,10 @@
 		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
 
 		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else if(windowsPasswordComplexityReq){
+		if(windowsPasswordComplexityReq){
 			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
+		}else if(passwordComplexityReq1){
+			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
 		}else {
 			if(containUppercaseLetter && containLowerCaseLetter){
 				msg += '，需要包含大小写字母';
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r37658 -r37659
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 37658)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 37659)
@@ -22,10 +22,10 @@
 		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
 
 		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else if(windowsPasswordComplexityReq){
+		if(windowsPasswordComplexityReq){
 			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
+		}else if(passwordComplexityReq1){
+			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
 		}else {
 			if(containUppercaseLetter && containLowerCaseLetter){
 				msg += '，需要包含大小写字母';