From f9428b9bf58824e408d4c8fbeb253ba6cc4d4f5d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 09:16:02 +0800
Subject: [PATCH] 10.18
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 1528104..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}"/>
--
Gitblit v1.7.1