1、工资查看增加曾思敏；

2、如部门审核和总经办审核是同一个人，则自动通过。

cost-service/src/main/java/com/blt/other/module/cost/controller/CostDetailController.java

@@ -74,7 +74,7 @@ public class CostDetailController {
                                 || user.getUseraccount().equals("陈文静")
                                 || user.getUseraccount().equals("林冬菊")
                                 || user.getUseraccount().equals("梁献云")
-                                || user.getUseraccount().equals("姚晓婷")
+                                || user.getUseraccount().equals("曾思敏")
                                 || user.getUseraccount().equals("刘春丽")
                                 || user.getUseraccount().equals("魏秋裕")
                                 || user.getUseraccount().equals("关秀利")

cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/GeneralManagerCheckState.java

@@ -7,6 +7,7 @@ import com.blt.other.database.model.CostLogDomain;
 import com.blt.other.database.model.CostTypeDomain;
 import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.cost.dao.CostCurrentReviewerMapper;
+import com.blt.other.module.cost.dao.CostLogDao;
 import com.blt.other.module.cost.dao.CostTypeDao;
 import com.blt.other.module.cost.model.ApprovalHistoryDomain;
 import com.blt.other.module.cost.model.CostCurrentReviewer;
@@ -45,6 +46,8 @@ public class GeneralManagerCheckState extends CostState {
     ApprovalHistoryService approvalHistoryService;
     @Resource
     CostTypeDao costTypeDao;
+    @Resource
+    CostLogDao costLogDao;
 
     //审批次数
     static Map<LocalDate, Integer> APPROVE_TIMES = new ConcurrentHashMap<>();
@@ -152,6 +155,17 @@ public class GeneralManagerCheckState extends CostState {
     }
 
     private boolean autoPass(CostDomain costDomain) {
+        CostLogDomain costLogDomain = costLogDao.selectDepartmentCheckLog(costDomain.getCostNo());
+        List<CostCurrentReviewer> costCurrentReviewerList = costCurrentReviewerMapper.selectByCostNo(costDomain.getCostNo());
+        if (costLogDomain != null
+                && costCurrentReviewerList
+                    .stream()
+                    .map(CostCurrentReviewer::getOaUserId)
+                    .collect(Collectors.toList())
+                    .contains(costLogDomain.getUpdateUserid())) {
+            //部门审核人和总经办审核人是同一个人，总经办审核人自动通过。
+            return true;
+        }
         if (costDomain.getCostForm().equals(2)) {
             //收款不需要审核
             return true;