From 4beda57943e7e3b1b150dd9b4160f1b88a1c908b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 4 Dec 2024 16:50:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=BC=96=E5=88=B6=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=BA=E5=B2=97=E4=BD=8D=E6=97=B6=E5=AF=BC=E5=85=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/util/saveimport/StaffInfoImportUtil.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
index d69ce8b1..be3e7246 100644
--- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
+++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
@@ -236,6 +236,8 @@ public class StaffInfoImportUtil {
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                     continue nextRow;
                                 }
+                                parentJobId = jobPList.get(0).getId();
+
                             }
                         }
                         map.put("job_id", parentJobId);
@@ -292,7 +294,7 @@ public class StaffInfoImportUtil {
                     break;
                 case "3": // 岗位
                     if (null == parentJobId) {
-                        checkMsg = "编制维度选择岗位时，岗位必填！";
+                        checkMsg = "编制维度选择岗位时，未找到对应岗位！";
                     } else {
                         JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId);
                         if (null == jobPO) {
-- 
2.40.0.windows.1


From 3a5c5812419ca8f025b57dca3eb0727686a5c013 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 10 Dec 2024 17:06:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?3.=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=96=E9=83=A8=E4=BA=BA=E5=91=98=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=EF=BC=9B=204.=E8=8A=B1=E5=90=8D=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B7=B3=E8=BD=AC=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8D=A1=E7=89=87=E8=BF=98=E6=98=AF=E8=81=9A?=
 =?UTF-8?q?=E6=89=8D=E6=9E=97=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/mapper/resource/HrmResourceMapper.xml   | 2 +-
 .../organization/service/impl/HrmResourceServiceImpl.java       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index a5bdb0cd..808ffc0a 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -22,7 +22,7 @@
     <select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
         select distinct a.subcompanyid1, a.departmentid, a.jobtitle
         from hrmresource a
-        where a.status &lt; 4
+        where a.status &lt; 4 and a.seclevel &gt;= 0
           and not exists
             (select 1
              from jcl_org_job b
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 7903d988..0ccd5ea6 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -643,6 +643,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
         btnDatas.put("loginId", user.getUID());
+        btnDatas.put("cardType", new BaseBean().getPropValue("hrmOrganization", "cardType"));
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
         btnDatas.put("searchTemplateId", getSearchTemplateId());
-- 
2.40.0.windows.1


From b9c9d1d65aa7f92b749b5e3b382a9520257caf05 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 16 Dec 2024 10:04:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=9A=E4=BD=99import=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/entity/chart/StatisticsVO.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/engine/organization/entity/chart/StatisticsVO.java b/src/com/engine/organization/entity/chart/StatisticsVO.java
index 80b90f55..c326d17b 100644
--- a/src/com/engine/organization/entity/chart/StatisticsVO.java
+++ b/src/com/engine/organization/entity/chart/StatisticsVO.java
@@ -1,6 +1,5 @@
 package com.engine.organization.entity.chart;
 
-import com.icbc.api.internal.apache.http.impl.cookie.S;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-- 
2.40.0.windows.1


From aff49d0bc9e46450e2e7d540eb0f303b4c0f4e5a Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Fri, 20 Dec 2024 16:28:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/service/impl/ChartServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 4bc2e1d4..3fab7422 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -1040,12 +1040,13 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               d.bmfzr          as fleader,\n" +
+                    "               e.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
                     "                 left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
                     "                 left join hrmdepartment c on a.supdepid = c.id\n" +
+                    "                 left join hrmdepartmentdefined e on a.id=e.deptid\n" +
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
         }
 
-- 
2.40.0.windows.1