From 5805dbfb36a8e81950d06ef34136b595837ababb Mon Sep 17 00:00:00 2001
From: lw <532810027@qq.com>
Date: Mon, 17 Jun 2024 10:11:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E8=AF=9D=E9=9D=A2=E8=AF=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=20=202.=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E3=80=81=E7=AE=80=E5=8E=86=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88JD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml       | 14 +++++++-------
 .../src/main/resources/application.yml             | 12 ++++++------
 .../resources/mapper/ResumeFollowRecordMapper.xml  |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/zeroerr_oa-admin/src/main/resources/application-druid.yml b/zeroerr_oa-admin/src/main/resources/application-druid.yml
index 11f640a..386e1f3 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:
                 # 从数据源开关/默认关闭
diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml
index a886da0..7f2ca50 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:
diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml
index fc50dd5..5a3a003 100644
--- a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml
+++ b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml
@@ -69,6 +69,7 @@
         <if test="firstPass!=null and firstPass!=''">and first_pass=#{firstPass}</if>
         <if test="secondPass!=null and secondPass!=''">and second_pass =#{secondPass}</if>
         <if test="finalPass!=null and finalPass!=''">and final_pass=#{finalPass}</if>
+        <if test="isPass!=null and isPass!=''">and is_pass=#{isPass}</if>
         order by receive_date desc
     </select>