From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 6f68f95..fc2cf7b 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
@@ -15,33 +15,33 @@
 				</#select>
 				<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
 				<#input id="email" name="邮箱" type="email"  underline="true" value="${user.email}"/>
-				<div class="form-group" ${userCompanyId!=1? "hidden" :" "} >
+				<div class="form-group" ${userCompanyId! !=1? "hidden" :" "} >
 				<label class="col-sm-3 control-label">所属公司</label>
 				<div class="col-sm-9">
 					<select class="form-control" id="companyId" name="companyId">
-						@if(companyIds!=null && companyId!=null){
-						@for(item in companyIds){
-						@if(item.id==companyId){
-						<option value="${item.id}">${item.name}</option>
+						@if(companyIds! !=null && companyId! !=null){
+						@for(item in companyIds!){
+						@if(item.id! == companyId!){
+						<option value="${item.id}">${item.name!}</option>
 						@}
 						@}
-						@for(item in companyIds){
-						@if(item.id!=companyId){
-						<option value="${item.id}">${item.name}</option>
+						@for(item in companyIds!){
+						@if(item.id! !=companyId!){
+						<option value="${item.id}">${item.name!}</option>
 						@}
 						@}
 						@}
 					</select>
 				</div>
 			</div>
-			<div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
+			<div class="hr-line-dashed" ${companyId! !=1? "hidden" :" "} ></div>
 	</div>
 	<div class="col-sm-6">
 		<div id="driverInfoContent">
-			<#input id="name" name="姓名" underline="true" value="${user.name}"/>
+			<#input id="name" name="姓名" underline="true" value="${user.name!}"/>
 			<#input id="birthday" name="出生日期" underline="true" type="text"
-			value="${user.birthday}"/>
-			<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
+			value="${user.birthday!}"/>
+			<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid!}" value="${deptName!}"
 			clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
 			style="background-color: #ffffff !important;"/>
 			<#input id="phone" name="电话"  underline="true" value="${user.phone}"/>
@@ -65,7 +65,7 @@
 
 </div>
 </div>
-<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script src="${ctxPath}/modular/system/user/user_info.js"></script>
 <script>
 	laydate.render({
 		elem: '#birthday'

--
Gitblit v1.7.1