From 00ab437f9edcf62ca314abfaa20df3178ea51ce5 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Fri, 6 Jan 2023 15:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=AE=80=E5=8E=86=E4=B8=8B=E8=BD=BD=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=88=E5=8E=BB=E9=99=A4=E7=A6=BB=E8=81=8C=EF=BC=89=EF=BC=88?=
 =?UTF-8?q?20230106=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/resource/HrmResourceMapper.xml      |  1 +
 .../impl/PersonnelResumeServiceImpl.java       | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index 63550cfe..cfef3ddd 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -73,6 +73,7 @@
         from hrmresource h
                  inner join hrmdepartment a on a.id = h.departmentid
                  inner join hrmjobtitles b on b.id = h.jobtitle
+        where h.status &lt; 4
     </select>
     <select id="getHrmFamilyInfoByUser" resultType="com.engine.organization.entity.resume.po.HrmFamilyInfoPO">
         select *
diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
index ee4fa9f5..0097c1fb 100644
--- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
+++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
@@ -184,7 +184,6 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
             xwpfDocuments.add(doc);
             is.close();
 
-
             String fileName = paramMap.get("${lastName}") + ".docx";
             System.out.println(fileName);
             FileOutputStream os = null;
@@ -355,6 +354,13 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         return src1Document;
     }
 
+    /**
+     * @Title: compressAllFileZip
+     * @Description: 传递文件路径压缩文件，传递文件夹路径压缩文件夹，注：空的文件夹不会出现在压缩包内
+     * @param @param compresspath 需要压缩的文件夹的目录
+     * @return void    返回类型
+     * @throws
+     */
     public static boolean compressFileToZip(String compresspath) {
         boolean bool = false;
         try {
@@ -375,6 +381,16 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         return bool;
     }
 
+    /**
+     * @Title: compressZip
+     * @Description: 子文件夹中可能还有文件夹，进行递归
+     * @param @param zipOutput
+     * @param @param file
+     * @param @param suffixpath
+     * @param @throws IOException
+     * @return void    返回类型
+     * @throws
+     */
     private static void compressZip(ZipOutputStream zipOutput, File file, String suffixpath) {
         File[] listFiles = file.listFiles();// 列出所有的文件
         for (File fi : listFiles) {