修复bug2736 导出人员过滤已经删除的数据

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

@@ -959,15 +959,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             }
             CompanyPerson company = new CompanyPerson();
             BeanUtils.copyProperties(org, company);
-            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
+            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey(), false));
             return company;
         }).filter(c -> {
             return c != null;
         }).collect(Collectors.toList());
     }
 
-    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
-        return this.queryForList(null, false, parentId, bizOrgType);
+    // BUG 2736 人员导出过滤已经删除的数据by kongfm
+    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType, Boolean isDelete) {
+        return this.queryForList(null, false, parentId, bizOrgType, isDelete);
     }
 
     public OrgUsrDto getOrg(String amosUserId) {