wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-10-20 17:38:40 +08:00
commit e1f1b4eeb7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/performance/controller/FlowChartController.java
View File

@ -97,7 +97,7 @@ public class FlowChartController {
return R.ok(); return R.ok();
} }
@PostMapping("/deleteDetailProc") @GetMapping("/deleteDetailProc")
@ApiOperation("删除流程节点小流程") @ApiOperation("删除流程节点小流程")
public R deleteDetailProc(@RequestParam @ApiParam(value = "节点流程id", name = "id") Long id) { public R deleteDetailProc(@RequestParam @ApiParam(value = "节点流程id", name = "id") Long id) {
flowChartDetailRecordService.deleteFlowChartDetailRecordById(id); flowChartDetailRecordService.deleteFlowChartDetailRecordById(id);

2
src/main/resources/mapper/generator/StaffDao.xml
View File

@ -475,7 +475,7 @@
case occ.staff_status when 0 then '在职' else '离职' end staff_status 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 (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 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 join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 and occ.is_delete=0
</select> </select>