update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java

@@ -161,6 +161,8 @@ public class DepartmentCheckState extends CostState {
         Integer primaryDepartmentId;
         Integer secondDepartmentId;
 
+        DepartmentReviewer departmentReviewer = null;
+
         OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(departmentId);
 
         if (oaDepartment.getParentId() > 0) {
@@ -180,9 +182,13 @@ public class DepartmentCheckState extends CostState {
         DepartmentReviewer primaryDepartmentReviewer = departmentReviewerMapper.selectByPrimaryDepartmentId(primaryDepartmentId);
         DepartmentReviewer secondDepartmentReviewer = departmentReviewerMapper.selectBySecondDepartmentId(secondDepartmentId);
         if (secondDepartmentReviewer != null) {
-            return secondDepartmentReviewer;
+            departmentReviewer = secondDepartmentReviewer;
+        }
+        departmentReviewer = primaryDepartmentReviewer;
+        if (departmentReviewer == null) {
+            throw new BizRuntimeException("请联系管理员添加部门审核人配置");
         }
-        return primaryDepartmentReviewer;
+        return departmentReviewer;
     }
 
     private void updateCurrentReviewer(Integer departmentId) {

bailuntec-cost-core/src/main/resources/application-dev.yml

@@ -2,9 +2,12 @@ spring:
   # 数据源配置
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://cdb-aanqm573.gz.tencentcdb.com:10120/bailun_other?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
+#    url: jdbc:mysql://cdb-aanqm573.gz.tencentcdb.com:10120/bailun_other?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
+#    username: root
+#    password: 'Aarob2020#'
+    url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
     username: root
-    password: 'Aarob2020#'
+    password: "#7kfnymAM$Y9-Ntf"
     hikari:
       maximum-pool-size: 200
       minimum-idle: 10