2026-06-18 调整人员查询接口,增加人员筛选逻辑,对人员档案表查询结果中,人员编码不为空和人员状态为实习、试用、正式的人员信息进行输出
This commit is contained in:
@@ -45,6 +45,7 @@ public class MemberHandleService {
|
|||||||
if (getMembersData == null) {
|
if (getMembersData == null) {
|
||||||
return new JSONArray();
|
return new JSONArray();
|
||||||
}
|
}
|
||||||
|
JSONArray filteredMembers = new JSONArray();
|
||||||
for (int i = 0; i < getMembersData.size(); i++) {
|
for (int i = 0; i < getMembersData.size(); i++) {
|
||||||
JSONObject getMember = getMembersData.getJSONObject(i);
|
JSONObject getMember = getMembersData.getJSONObject(i);
|
||||||
if (getMember == null || getMember.get("id") == null) {
|
if (getMember == null || getMember.get("id") == null) {
|
||||||
@@ -54,11 +55,23 @@ public class MemberHandleService {
|
|||||||
FormWhereCondition affiliatedUnitWhere = FormWhereCondition.build().display("系统姓名").value(orgMemberId);
|
FormWhereCondition affiliatedUnitWhere = FormWhereCondition.build().display("系统姓名").value(orgMemberId);
|
||||||
FormColumn formColumn = FormTableExecutor.queryOne(tableContext, Collections.singletonList(affiliatedUnitWhere), true);
|
FormColumn formColumn = FormTableExecutor.queryOne(tableContext, Collections.singletonList(affiliatedUnitWhere), true);
|
||||||
if (formColumn != null && formColumn.getFieldsMap() != null) {
|
if (formColumn != null && formColumn.getFieldsMap() != null) {
|
||||||
|
// 获取表单中的字段数据
|
||||||
String memberNo = (String) formColumn.getFieldsMap().get("身份证号码");
|
String memberNo = (String) formColumn.getFieldsMap().get("身份证号码");
|
||||||
getMember.put("memberNo", memberNo);
|
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) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user