From 664372dbbb4c1534262399914ca594553819b90c Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Sat, 31 Oct 2020 07:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=95=8C=E9=9D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/views/groupapp/groupAppsList.ftl         |  4 ++++
 .../templates/views/groupuser/groupUsersList.ftl       |  6 +++++-
 .../templates/views/resources/resourceAdd.ftl          |  8 ++++++++
 .../templates/views/roleusers/roleUsersList.ftl        |  4 ++++
 .../resources/templates/views/userinfo/userAdd.ftl     |  3 ++-
 .../resources/templates/views/userinfo/usersList.ftl   | 10 +++++++---
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
index cb732533c..6d56f052b 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
@@ -11,6 +11,10 @@
    	
 	$(function () {
 		$("#addGroupAppsBtn").on("click",function(){
+			if($("#groupId").val()==""){
+				$.alert({content:$.platform.messages.select.alertText});	
+				return;
+			}
 			var settings={
 					url		:	"<@base/>/groupPrivileges/addGroupAppsList/"+$("#groupId").val(),//window url
 					title	:	"New",//title
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
index 3d82b8c96..c5eef7993 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
@@ -11,7 +11,11 @@
 	
 	
 	$(function () {
-		$("#insertGroupUserBtn").on("click",function(){		
+		$("#insertGroupUserBtn").on("click",function(){	
+			if($("#groupId").val()==""){
+				$.alert({content:$.platform.messages.select.alertText});	
+				return;
+			}
 			var settings={
 							url		:	"<@base/>/groupMember/addGroupAppsList/"+$("#groupId").val(),//window url
 							title	:	"New",//title
diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
index acfe59088..dc2b87833 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
@@ -15,6 +15,14 @@ $(function () {
     $("#appId").val($.cookie("select_app_id"));
     $("#parentId").val($.cookie("select_res_id"));
     $("#parentName").val($.cookie("select_res_name"));
+    
+    if($("#parentId").val()==""){
+		$.alert({
+			content:$.platform.messages.select.alertText,
+			callback:function (){$.closeWindow();}
+		});	
+		
+	}
 });
 </script>
 </head>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/roleusers/roleUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/roleusers/roleUsersList.ftl
index fe8daa48a..1f21b5979 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/roleusers/roleUsersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/roleusers/roleUsersList.ftl
@@ -12,6 +12,10 @@
 	
 	$(function () {
 		$("#insertGroupUserBtn").on("click",function(){		
+			if($("#roleId").val()==""){
+				$.alert({content:$.platform.messages.select.alertText});	
+				return;
+			}
 			var settings={
 							url		:	"<@base/>/rolemembers/addRoleAppsList/"+$("#roleId").val(),//window url
 							title	:	"New",//title
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
index 877ecaa38..8bf02a700 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
@@ -51,7 +51,8 @@
 	<tr>
 		<td style="width:15%;"><@locale code="userinfo.username" />：</td>
 		<td style="width:35%;">
-		<input type="hidden" id="id" name="id" value=""/>
+			<input type="hidden" id="id" name="id" value=""/>
+			<input type="hidden" id="status" name="status" value="1"/>
 			<input  class="form-control"  type="text" required="" id="username" name="username"  title="" value=""/>
 		</td>
 		<td style="width:15%;"><@locale code="login.text.password" />：</td>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
index 80c5de74a..51d83e67f 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
@@ -136,9 +136,13 @@ $(function () {
 	    		}
 	    	);//end tree
 	    	
-	$("#changepwdBtn").on("click",function(){	
-			$("#changepwdBtnHidden").attr("wurl","<@base/>/userinfo/forwardChangePassword/"+$.dataGridSelRowsData("#datagrid")[0].id);
-		   	$("#changepwdBtnHidden").click();	
+	$("#changepwdBtn").on("click",function(){
+	 	if($.dataGridSelRowsData("#datagrid")[0]==null){
+			$.alert({content:$.platform.messages.select.alertText});
+			return;
+		}	
+		$("#changepwdBtnHidden").attr("wurl","<@base/>/userinfo/forwardChangePassword/"+$.dataGridSelRowsData("#datagrid")[0].id);
+		$("#changepwdBtnHidden").click();	
 	});
 	
 });