任务 9303

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PeopleBasicInfoDto.java

@@ -24,6 +24,9 @@ public class PeopleBasicInfoDto {
     @ApiModelProperty(value = "所属机构")
     private String company;
 
+    @ApiModelProperty(value = "岗位类型-用于列表筛选")
+    private String positionType;
+
     @ApiModelProperty(value = "机构code")
     private String companyCode;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -586,6 +586,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if (!req.isEmpty()&&req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
 			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
 		}
+		String positionType = "";
+		if(req.containsKey("positionType")) {
+			positionType = req.get("positionType").toString();
+		}
 
 		req.remove("bizOrgName");
 		req.remove("pageSize");
@@ -593,6 +597,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("parentId");
 		req.remove("amosOrgId");
 		req.remove("company");
+		req.remove("positionType");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
@@ -636,6 +641,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				}
 			});
 		}
+
+
+		if(!positionType.equals("")) {
+			String positionTypeFine = positionType;
+		   list = list.stream().filter(e-> !ValidationUtil.isEmpty(e.get("positionType")) &&  e.get("positionType").toString().contains(positionTypeFine)).collect(Collectors.toList());
+		}
 		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
 		pageBean.setRecords(list);
 //