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] =?UTF-8?q?3.=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0=E6=97=B6=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=A4=96=E9=83=A8=E4=BA=BA=E5=91=98=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=EF=BC=9B=204.=E8=8A=B1=E5=90=8D=E5=86=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E8=B7=B3=E8=BD=AC=E6=98=AF=E5=90=A6=E4=B8=BA=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8D=A1=E7=89=87=E8=BF=98=E6=98=AF=E8=81=9A=E6=89=8D?=
 =?UTF-8?q?=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());