update

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

@@ -23,10 +23,14 @@ import com.blt.other.module.auth.dao.OaDepartmentMapper;
 import com.blt.other.module.auth.dao.OaUserMapper;
 import com.blt.other.module.auth.model.OaDepartment;
 import com.blt.other.module.auth.model.OaUser;
-import com.blt.other.module.cost.dao.*;
+import com.blt.other.module.cost.dao.CostCompanyDao;
+import com.blt.other.module.cost.dao.CostDao;
+import com.blt.other.module.cost.dao.CostDetailDao;
+import com.blt.other.module.cost.dao.CostTemplateBaseColMapper;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
 import com.blt.other.module.cost.dto.response.CostPageResult;
 import com.blt.other.module.cost.dto.response.UpdateCostResp;
+import com.blt.other.module.cost.model.CostCurrentReviewer;
 import com.blt.other.module.cost.model.CostDetailDomain;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.model.CostTemplateBaseCol;
@@ -397,6 +401,9 @@ public abstract class AbstractCostService implements CostService {
         costDomain.setCostStatus(CostDomain.STATUS_REJECT);
         costDomain.setLastModifyDate(LocalDateTime.now());
         costDao.updateById(costDomain);
+
+        costCurrentReviewerService.remove(new LambdaQueryWrapper<CostCurrentReviewer>()
+                .eq(CostCurrentReviewer::getCostNo, costDomain.getCostNo()));
     }
 
     @Resource

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/dto/request/DepartmentReviewerListReq.java

@@ -34,4 +34,6 @@ public class DepartmentReviewerListReq {
 
     @ApiModelProperty(value = "二级部门id")
     private Integer secondDepartmentId;
+
+    private Integer oaCompanyId;
 }

bailuntec-cost-core/src/main/resources/mapper/module/sys/DepartmentReviewerMapper.xml

@@ -7,7 +7,11 @@
         select t1.*
         from department_reviewer t1
         left join cost_reviewer t2 on t1.id = t2.refer_id
+        left join oa_department t3 on t1.primary_department_id = t3.department_id
         where true
+        <if test="req.oaCompanyId !=null">
+            and t3.company_id =#{req.oaCompanyId}
+        </if>
         <if test="req.reviewerUserId !=null">
             and t2.reviewer_user_id =#{req.reviewerUserId}
         </if>