From 1d3a5043ebf3fe561c4e8eec5af1a94791b5a1bf Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 26 Dec 2024 09:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=20QC3445872=20=E7=BE=8E=E4=B9=8B=E9=AB=98?=
 =?UTF-8?q?=E9=97=A8=E6=88=B7=E5=85=83=E7=B4=A0=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PortalElementCusServiceImpl.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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;