diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index 8d2abf42..93011dc1 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -488,6 +488,7 @@ public class StaffServiceImpl extends ServiceImpl impleme }else{ log.info("没有找到父级部门,部门id{}", depId); departManagers.setManagers(new ArrayList<>()); + return departManagers; } type--; } diff --git a/src/main/java/com/lz/modules/flow/service/FlowStartService.java b/src/main/java/com/lz/modules/flow/service/FlowStartService.java index 41e1458f..32e5b1f5 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowStartService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowStartService.java @@ -36,4 +36,6 @@ public interface FlowStartService extends IService { FlowStart selectFlowStartByName(String name); R saveStart(FlowStart flowStart); + + R getModelById(Long id, int type); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index c126c7e1..cdd06d39 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -490,5 +490,14 @@ public class FlowStartServiceImpl extends ServiceImpl staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup);*/ + //flowStart = flowStartService.selectFlowStartById(flowStart.getId()); + DepartManagers staffEntity = staffService.findLeader(id, type); + return R.ok().put("data",staffEntity); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index 8d50ec45..5074fa94 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -46,8 +46,6 @@ public class FlowStartController { private FlowStartService flowStartService; - @Autowired - private EvaluationGroupService evaluationGroupService; @@ -58,11 +56,7 @@ public class FlowStartController { @GetMapping("/getById") public R getById(@RequestParam Long id, @RequestParam int type) { - EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(id); - List staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup); - //flowStart = flowStartService.selectFlowStartById(flowStart.getId()); - //List staffEntity = staffService.findLeader(id, type); - return R.ok().put("data",staffIds); + return flowStartService.getModelById(id, type); } diff --git a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml index 519a57b9..f686fa45 100644 --- a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml @@ -78,7 +78,7 @@