update

bailuntec-cost-core/src/main/java/com/blt/other/common/interceptor/MvcInterceptorConfig.java

@@ -23,10 +23,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
     protected void addInterceptors(InterceptorRegistry registry) {
 
 
-        registry.addInterceptor(sessionHandlerInterceptor)
-                .excludePathPatterns();
-
-
+//        registry.addInterceptor(sessionHandlerInterceptor);
         super.addInterceptors(registry);
     }
 
@@ -43,6 +40,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
 
         registry.addResourceHandler("/doc.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
+
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
     }

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

@@ -158,15 +158,27 @@ public class DepartmentCheckState extends CostState {
     }
 
     private DepartmentReviewer getCurrentDepartmentReviewer(Integer departmentId) {
+        Integer primaryDepartmentId;
+        Integer secondDepartmentId;
+
         OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(departmentId);
-        Integer primaryDepartmentId = departmentId;
 
         if (oaDepartment.getParentId() > 0) {
-            primaryDepartmentId = oaDepartment.getParentId();
+            OaDepartment nextDepartment = oaDepartmentMapper.selectByDepartmentId(oaDepartment.getParentId());
+            if (nextDepartment.getParentId() > 0) {
+                primaryDepartmentId = nextDepartment.getParentId();
+                secondDepartmentId = nextDepartment.getDepartmentId();
+            } else {
+                primaryDepartmentId = oaDepartment.getParentId();
+                secondDepartmentId = oaDepartment.getDepartmentId();
+            }
+        } else {
+            primaryDepartmentId = departmentId;
+            secondDepartmentId = null;
         }
 
         DepartmentReviewer primaryDepartmentReviewer = departmentReviewerMapper.selectByPrimaryDepartmentId(primaryDepartmentId);
-        DepartmentReviewer secondDepartmentReviewer = departmentReviewerMapper.selectBySecondDepartmentId(departmentId);
+        DepartmentReviewer secondDepartmentReviewer = departmentReviewerMapper.selectBySecondDepartmentId(secondDepartmentId);
         if (secondDepartmentReviewer != null) {
             return secondDepartmentReviewer;
         }