update

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

@@ -14,6 +14,7 @@ import com.blt.other.module.sys.dao.DepartmentReviewerMapper;
 import com.blt.other.module.sys.model.CostReviewer;
 import com.blt.other.module.sys.model.DepartmentReviewer;
 import com.blt.other.module.sys.model.SpecDepartmentCheckConfig;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -158,29 +159,12 @@ public class DepartmentCheckState extends CostState {
     }
 
     private DepartmentReviewer getCurrentDepartmentReviewer(Integer departmentId) {
-        Integer primaryDepartmentId;
-        Integer secondDepartmentId;
 
-        DepartmentReviewer departmentReviewer = null;
+        DepartmentChain departmentChain = this.getDepartmentChain(new DepartmentChain(departmentId));
 
-        OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(departmentId);
-
-        if (oaDepartment.getParentId() > 0) {
-            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(secondDepartmentId);
+        DepartmentReviewer departmentReviewer;
+        DepartmentReviewer primaryDepartmentReviewer = departmentReviewerMapper.selectByPrimaryDepartmentId(departmentChain.getDepartmentId());
+        DepartmentReviewer secondDepartmentReviewer = departmentReviewerMapper.selectBySecondDepartmentId(departmentChain.next.getDepartmentId());
         if (secondDepartmentReviewer != null) {
             departmentReviewer = secondDepartmentReviewer;
         } else {
@@ -192,12 +176,33 @@ public class DepartmentCheckState extends CostState {
         return departmentReviewer;
     }
 
-//    private OaDepartment getSecondDepartment(Integer departmentId) {
-//        OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(departmentId);
-//        if (oaDepartment.getParentId() == 0) {
-//
-//        }
-//    }
+    /**
+     * @param last 最后一个chain
+     * @return chain
+     */
+    private DepartmentChain getDepartmentChain(DepartmentChain last) {
+        OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(last.getDepartmentId());
+        if (oaDepartment.getParentId() > 0) {
+            DepartmentChain pre = new DepartmentChain(oaDepartment.getParentId());
+            last.setPre(pre);
+            pre.setNext(last);
+            return this.getDepartmentChain(pre);
+        } else {
+            return last;
+        }
+    }
+
+    @Data
+    static class DepartmentChain {
+        DepartmentChain pre;
+        DepartmentChain next;
+
+        Integer departmentId;
+
+        public DepartmentChain(Integer departmentId) {
+            this.departmentId = departmentId;
+        }
+    }
 
     private void updateCurrentReviewer(Integer departmentId) {
         CostDomain costDomain = costContext.costDomain;