Skip to content

H
hg-smart
Commit 99a04b67 by wuwenlong
Options

首页个人信息&修改密码功能bugfix；

parent ee9f0d9d
Showing with 37 additions and 3 deletions
src/main/resources/META-INF/resources/iPlatV7-index.jsp
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %> <%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
<%@ page import="com.baosight.iplat4j.core.service.soa.XLocalManager" %> <%@ page import="com.baosight.iplat4j.core.service.soa.XLocalManager" %>
<%@ page import="com.baosight.iplat4j.ed.service.PlatApplicationDynamicContext" %> <%@ page import="com.baosight.iplat4j.ed.service.PlatApplicationDynamicContext" %>
<%@ page import="com.baosight.hggp.hg.xs.tools.HGXSTools" %>
<%@ page import="com.baosight.hggp.hg.xs.domain.Org" %>
<%@ page import="java.util.List" %>
<%@ page import="org.apache.commons.collections.CollectionUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %> <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
...@@ -21,8 +25,29 @@ ...@@ -21,8 +25,29 @@
UserSession.web2Service(request); UserSession.web2Service(request);
String userName = UserSession.getLoginCName(); String userName = UserSession.getLoginCName();
String loginName = UserSession.getLoginName(); String loginName = UserSession.getLoginName();
List<Org> orgList =HGXSTools.XsOrg.queryByUser();
String companyName = "";
String orgName = "";
String orgInfo = "";
if(CollectionUtils.isNotEmpty(orgList)){
Org org = orgList.get(0);
companyName = org.getCompanyName();
orgName = org.getOrgCname();
if(StringUtils.isNotBlank(companyName)) {
orgInfo = companyName;
if (!StringUtils.equals(org.getCompanyCode(), org.getOrgEname()) && StringUtils.isNotBlank(orgName)) {
orgInfo += "-" + orgName;
}
}
if(StringUtils.isBlank(orgName)){
orgName = companyName;
}
}
request.setAttribute("userName", userName); request.setAttribute("userName", userName);
request.setAttribute("loginName", loginName); request.setAttribute("loginName", loginName);
request.setAttribute("companyName", companyName);
request.setAttribute("orgName", orgName);
request.setAttribute("orgInf", orgInfo);
String efSecurityToken = null; String efSecurityToken = null;
Boolean SideBarIsMini = PlatApplicationContext.getProperty("SideBarIsMini")==null?false: Boolean.valueOf(PlatApplicationContext.getProperty("SideBarIsMini")); Boolean SideBarIsMini = PlatApplicationContext.getProperty("SideBarIsMini")==null?false: Boolean.valueOf(PlatApplicationContext.getProperty("SideBarIsMini"));
...@@ -118,6 +143,11 @@ ...@@ -118,6 +143,11 @@
<c:set var="loadingIcon" value="<%=loadingIcon%>" scope="session"/> <c:set var="loadingIcon" value="<%=loadingIcon%>" scope="session"/>
<c:set var="SideBarIsMini" value="<%=SideBarIsMini%>" /> <c:set var="SideBarIsMini" value="<%=SideBarIsMini%>" />
<c:set var="loginName" value="<%=loginName%>" /> <c:set var="loginName" value="<%=loginName%>" />
<c:set var="companyName" value="<%=companyName%>" />
<c:set var="orgName" value="<%=orgName%>" />
<c:set var="orgInfo" value="<%=orgInfo%>" />
<!--[if IE 9]> <!--[if IE 9]>
<html class="ie9 no-focus" xmlns="http://www.w3.org/1999/xhtml"> <html class="ie9 no-focus" xmlns="http://www.w3.org/1999/xhtml">
<![endif]--> <![endif]-->
...@@ -167,8 +197,8 @@ ...@@ -167,8 +197,8 @@
<script src="${iPlatStaticURL}/iplatui/assets/js/iplat.ui.bootstrap.min.js"></script> <script src="${iPlatStaticURL}/iplatui/assets/js/iplat.ui.bootstrap.min.js"></script>
<script src="${iPlatStaticURL}/iplatui/js/iplat.ui.min.js"></script> <script src="${iPlatStaticURL}/iplatui/js/iplat.ui.min.js"></script>
<script src="${iPlatStaticURL}/iPlatV7-index.js"></script> <script src="${iPlatStaticURL}/iPlatV7-index.js"></script>
<%-- <link href="${iPlatStaticURL}/Layx/layx.css" rel="stylesheet" type="text/css" />--%> <link href="${iPlatStaticURL}/Layx/layx.css" rel="stylesheet" type="text/css" />
<%-- <script src="${iPlatStaticURL}/Layx/layx.js" type="text/javascript"></script>--%> <script src="${iPlatStaticURL}/Layx/layx.js" type="text/javascript"></script>
<%-- <script src="${iPlatStaticURL}/EM/NT/websocket.js"></script>--%> <%-- <script src="${iPlatStaticURL}/EM/NT/websocket.js"></script>--%>
</head> </head>
...@@ -317,8 +347,12 @@ ...@@ -317,8 +347,12 @@
<span>${loginName}</span> <span>${loginName}</span>
</li> </li>
<li> <li>
<span class="information">公司:</span>
<span class="detail-info user-org">${companyName}</span>
</li>
<li>
<span class="information">组织机构:</span> <span class="information">组织机构:</span>
<span class="detail-info user-org"></span> <span class="detail-info user-org">${orgName}</span>
</li> </li>
<%--<li data-accountset="true"> <%--<li data-accountset="true">
<span class="information k-link change-org">公司别:</span> <span class="information k-link change-org">公司别:</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment