From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
index 572e1f9..16cbe7d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -19,9 +19,16 @@
 					<#input id="idCard" name="身份证号" type="text" underline="true" value="${user.idCard}"/>
 					<#select id="roleid" name="角色" underline="true" >
 					@for(l in list){
-					    <option value="${l.id}" ${l.id == user.roleid ? 'selected=selected' : ''}>${l.name}</option>
+					<option value="${l.id}" ${l.id == user.roleid ? 'selected=selected' : ''}>${l.name}</option>
+					@}
+				</#select>
+					@if(role == 1){
+					<#select id="deptid" name="角色" underline="true" >
+					@for(l in depts){
+					    <option value="${l.id}" ${l.id == user.deptid ? 'selected=selected' : ''}>${l.fullname}</option>
 					@}
 					</#select>
+				@}
 			</div>
 		</div>
 	</div>
@@ -33,7 +40,9 @@
 
 	<div class="row btn-group-m-t">
 		<div class="col-sm-10">
+			@if(type == 1){
 			<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+			@}
 			<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
 		</div>
 	</div>

--
Gitblit v1.7.1