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); }