From 073f93059583a0030fc9757e2c13b3998e426b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=AD=A3=E5=9B=BD?= <438926402@qq.com> Date: Thu, 18 Jun 2026 10:27:57 +0800 Subject: [PATCH] =?UTF-8?q?2026-06-18=20=E8=B0=83=E6=95=B4=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E4=BA=BA=E5=91=98=E6=A1=A3=E6=A1=88=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=AD=EF=BC=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=BC=96=E7=A0=81=E4=B8=8D=E4=B8=BA=E7=A9=BA=E5=92=8C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=8A=B6=E6=80=81=E4=B8=BA=E5=AE=9E=E4=B9=A0?= =?UTF-8?q?=E3=80=81=E8=AF=95=E7=94=A8=E3=80=81=E6=AD=A3=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E8=BF=9B=E8=A1=8C=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MemberHandleService.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/seeyon/apps/src_organizationHandle/service/MemberHandleService.java b/src/main/java/com/seeyon/apps/src_organizationHandle/service/MemberHandleService.java index 871a96d..47f5d56 100644 --- a/src/main/java/com/seeyon/apps/src_organizationHandle/service/MemberHandleService.java +++ b/src/main/java/com/seeyon/apps/src_organizationHandle/service/MemberHandleService.java @@ -45,6 +45,7 @@ public class MemberHandleService { if (getMembersData == null) { return new JSONArray(); } + JSONArray filteredMembers = new JSONArray(); for (int i = 0; i < getMembersData.size(); i++) { JSONObject getMember = getMembersData.getJSONObject(i); if (getMember == null || getMember.get("id") == null) { @@ -54,11 +55,23 @@ public class MemberHandleService { FormWhereCondition affiliatedUnitWhere = FormWhereCondition.build().display("系统姓名").value(orgMemberId); FormColumn formColumn = FormTableExecutor.queryOne(tableContext, Collections.singletonList(affiliatedUnitWhere), true); if (formColumn != null && formColumn.getFieldsMap() != null) { +// 获取表单中的字段数据 String memberNo = (String) formColumn.getFieldsMap().get("身份证号码"); getMember.put("memberNo", memberNo); + + String personnelNo = (String) formColumn.getFieldsMap().get("人员编号"); + Object memberStatusObj = formColumn.getFieldsMap().get("人员状态"); + String memberStatus = memberStatusObj != null ? String.valueOf(memberStatusObj) : ""; + + if (StringUtil.isNotEmpty(personnelNo) + && ("-3777984022611473481".equals(memberStatus)//试用期 + || "-5162329154979938018".equals(memberStatus)//实习 + || "1758330046862806186".equals(memberStatus))) {//正式员工 + filteredMembers.add(getMember); + } } } - return getMembersData; + return filteredMembers; } catch (Exception e) { throw new RuntimeException(e); }