From cca5246358435d173bcc599cd830697f8321a393 Mon Sep 17 00:00:00 2001
From: lw <532810027@qq.com>
Date: Thu, 27 Jun 2024 17:13:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=92=8C=E4=BB=BB=E5=8A=A1=E8=B7=9F=E8=B8=AA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml     | 16 ++++++++--------
 .../src/main/resources/application.yml           | 16 ++++++++--------
 .../controller/RecruitFollowController.java      |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/zeroerr_oa-admin/src/main/resources/application-druid.yml b/zeroerr_oa-admin/src/main/resources/application-druid.yml
index 386e1f3..ddd2703 100644
--- a/zeroerr_oa-admin/src/main/resources/application-druid.yml
+++ b/zeroerr_oa-admin/src/main/resources/application-druid.yml
@@ -5,14 +5,14 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: zeoa
-                password: dHahLWNYB7tD2Mia
 #            master:
-#                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: zero
+#                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: zeoa
+#                password: dHahLWNYB7tD2Mia
+            master:
+                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: zero
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -51,7 +51,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: liaowei
+                login-username: lw
                 login-password: 123456
             filter:
                 stat:
diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml
index 7f2ca50..f44ce9a 100644
--- a/zeroerr_oa-admin/src/main/resources/application.yml
+++ b/zeroerr_oa-admin/src/main/resources/application.yml
@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  #profile: D:/zeroerr/uploadPath
-  profile: /home/zeroerr_oa/uploadPath
+  profile: D:/zeroerr/uploadPath
+  #profile: /home/zeroerr_oa/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -69,15 +69,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.189
-    #host: localhost
+    #host: 192.168.1.189
+    host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
-    #password:
+    #password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -97,8 +97,8 @@ token:
   header: Authorization
   # 令牌密钥
   secret: vbcdefgeijklmnopqrsturwxyp
-  # 令牌有效期（默认30分钟）
-  expireTime: 30
+  # 令牌有效期（默认240分钟）
+  expireTime: 240
 
 # MyBatis配置
 mybatis-plus:
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java
index 43bd8fe..ba2c8ba 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java
@@ -215,7 +215,7 @@ public class RecruitFollowController extends BaseController {
                 if(result.isPresent()){
                     FollowVO followVO = result.get();
                     //封装合格简历数
-                    followVO.setPassResumeCount(resumeFollowRecordList.size());
+                    followVO.setPassResumeCount(resumeFollowRecords.size());
 
                     //设置初试人数
                     followVO.setFirstInterviewCount(resumeFollowRecords.stream()
@@ -268,6 +268,7 @@ public class RecruitFollowController extends BaseController {
                     ResumeFollowRecord resumeFollowRecord = resumeFollowRecords.get(0);
                     followVO.setPostId(resumeFollowRecord.getPostId());
                     followVO.setPostName(resumeFollowRecord.getPostName());
+                    followVO.setPassResumeCount(resumeFollowRecords.size());
                     RecruitStructure postNodeId = recruitStructureService.getByNodeId(followVO.getPostId());
                     if(!ObjectUtils.isEmpty(postNodeId)) {
                         if (postNodeId.getTaskId() != null) {