diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 4f6f0c0b..3594bcf7 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -97,7 +97,7 @@ public class FlowChartController { return R.ok(); } - @PostMapping("/deleteDetailProc") + @GetMapping("/deleteDetailProc") @ApiOperation("删除流程节点小流程") public R deleteDetailProc(@RequestParam @ApiParam(value = "节点流程id", name = "id") Long id) { flowChartDetailRecordService.deleteFlowChartDetailRecordById(id); diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 664c39c0..86b09b19 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -475,7 +475,7 @@ case occ.staff_status when 0 then '在职' else '离职' end staff_status from (select staff.id as staff_id, staff.name as name, relate.is_leader as department_leader from lz_departments_staff_relate relate join lz_staff staff on staff.id = relate.staff_id - where relate.department_id = #{departmentId} and relate.is_delete=0 and staff.is_delete=0) jj + where relate.department_id = #{departmentId} and relate.is_delete=0 and staff.is_delete=0 group by relate.staff_id) jj join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 and occ.is_delete=0