人员查询增加personStatus条件

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -119,6 +119,7 @@
             u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
             u.parent_id parentId,
+            u.person_status personStatus,
             (select biz_org_name from cb_org_usr where sequence_nbr = u.parent_id) as companyName,
             g.*
             FROM
@@ -188,6 +189,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="map.personStatus != null and map.personStatus != ''">
+                AND u.person_status = #{map.personStatus}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

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

@@ -614,6 +614,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("peopleType", peopleType);
 		}
 
+		String personStatus = "";
+		if(req.containsKey("personStatus")) {
+			personStatus = req.get("personStatus").toString();
+			map.put("personStatus", personStatus);
+		}
+
 		req.remove("pageSize");
 		req.remove("pageNum");
 		req.remove("parentId");
@@ -623,6 +629,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("peopleType");
 		req.remove("bizOrgName");
 		req.remove("fireManagementPost");
+		req.remove("personStatus");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));