update

bailuntec-cost-core/src/main/java/com/blt/other/auth/controller/CostReviewerController.java

@@ -82,7 +82,7 @@ public class CostReviewerController {
                                                      @RequestParam Integer oaDepartmentId,
                                                      @RequestParam String departmentReviewerUserIds) {
         oaDepartmentService.modifyFinancialReviewer(userId, oaDepartmentId, Lists.newArrayList(departmentReviewerUserIds.split(","))
-                .stream().map(Integer::valueOf).collect(Collectors.toList())));
+                .stream().map(Integer::valueOf).collect(Collectors.toList()));
         return CostResult.success();
     }
 

bailuntec-cost-core/src/main/java/com/blt/other/cost/service/CostTypeKindService.java

@@ -50,21 +50,6 @@ public interface CostTypeKindService {
     CostTypeKindDomain getKindByKindNo(String kindNo);
 
     /**
-     * 根据费用小类名称和公司名称获取种类信息
-     * @param kindName
-     * @param companyName
-     * @return
-     */
-    CostTypeKindDomain getKindByKindNameAndCompanyName(String kindName, String companyName);
-
-    /**
-     * 获取指定费用类型小类列表
-     * @param companyNo
-     * @return
-     */
-    List<CostTypeKindDto> getListByCompanyNoAndCostForm(String companyNo,Integer costForm);
-
-    /**
      * Excel 导入费用小类
      * @param file
      */

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

@@ -45,11 +45,19 @@ public class CostTemplateServiceImpl extends ServiceImpl<CostTemplateMapper, Cos
 
     @Override
     public void edit(CostTemplate costTemplate) {
-
+        this.save(costTemplate);
+        List<CostTemplateCol> costTemplateColList = costTemplate.getCostTemplateColList();
+        costTemplateColList.forEach(costTemplateCol -> costTemplateCol.setCostTemplateId(costTemplate.getId()));
+        costTemplateColService.saveBatch(costTemplateColList);
     }
 
     @Override
     public void delete(Integer id) {
-        this.removeById(id);
+        if (id != null) {
+            this.removeById(id);
+            costTemplateColService.remove(new LambdaQueryWrapper<CostTemplateCol>()
+                    .eq(CostTemplateCol::getCostTemplateId, id));
+        }
+
     }
 }

bailuntec-cost-core/src/main/resources/mapper/auth/OaDepartmentMapper.xml

@@ -6,7 +6,7 @@
         SELECT t1.*, t2.`name` company_name
         from oa_department t1
         LEFT JOIN oa_company t2 on t1.company_id = t2.oa_company_id
-        left join cost_reviewer t3 on t1.id = t3.refer_id and (t3.type = 1)
+        left join cost_reviewer t3 on t1.department_id = t3.refer_id and (t3.type = 1)
         where t1.parent_id = 0
         /*审核人*/
         <if test="req.reviewerUserId !=null">