From 177fc83ac25d5f6cd0790e39d610551e2575f83b Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 17:08:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=B0=8F=E6=B5=81=E7=A8=8B=E6=94=B9=E6=88=90get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/performance/controller/FlowChartController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From 308cfa766e0f424d05ba285d98e1f213797d16e9 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 17:30:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=97=B6=E5=A2=9E=E5=8A=A0group=20by?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/generator/StaffDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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