diff --git a/src/com/engine/mzgsecond/service/impl/PortalElementCusServiceImpl.java b/src/com/engine/mzgsecond/service/impl/PortalElementCusServiceImpl.java index 07ff45f..6364387 100644 --- a/src/com/engine/mzgsecond/service/impl/PortalElementCusServiceImpl.java +++ b/src/com/engine/mzgsecond/service/impl/PortalElementCusServiceImpl.java @@ -54,7 +54,6 @@ public class PortalElementCusServiceImpl extends Service implements PortalElemen .id(user.getUID()) .imageUrl(getImageFile(String.valueOf(user.getUID()))) .lastname(Util.formatMultiLang(user.getLastname(),String.valueOf(user.getLanguage()))) - .status(getStatus(user.getStatus())) .jobTitle(jobTitlesComInfo.getJobTitlesname(user.getJobtitle())) .day(0) .amount(restAmount) @@ -63,11 +62,15 @@ public class PortalElementCusServiceImpl extends Service implements PortalElemen .build(); String companystartdate = ""; - rs.executeQuery("select companystartdate from hrmresource where id = ?",user.getUID()); + Integer status = null; + rs.executeQuery("select companystartdate,status from hrmresource where id = ?",user.getUID()); if (rs.next()) { companystartdate = Util.null2String(rs.getString("companystartdate")); + status = Util.getIntValue(rs.getString("status")); } + personInfo.setStatus(getStatus(status)); + if (StringUtils.isNotEmpty(companystartdate)) { personInfo.setDay(getCompanyDay(companystartdate)); } @@ -205,7 +208,7 @@ public class PortalElementCusServiceImpl extends Service implements PortalElemen statusName="退休";break; case 7: statusName="无效";break; - default: + default: statusName="未设置"; break; } return statusName;