From 86fc82ae8c35c60ab6a5305fb42edb668cb9aab2 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 26 Oct 2020 16:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=9C=A8=E5=A4=9A=E4=B8=AA=E9=83=A8=E9=97=A8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E5=87=A0=E7=BA=A7=E9=A2=86?=
 =?UTF-8?q?=E5=AF=BC=E5=BC=82=E5=B8=B8=E3=80=82=E7=9B=AE=E5=89=8D=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/service/impl/StaffServiceImpl.java    | 1 +
 .../com/lz/modules/flow/service/FlowStartService.java    | 2 ++
 .../modules/flow/service/impl/FlowStartServiceImpl.java  | 9 +++++++++
 .../performance/controller/FlowStartController.java      | 8 +-------
 .../mapper/generator/DepartmentsStaffRelateDao.xml       | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

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<StaffDao, StaffEntity> 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> {
     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<FlowStartMapper, FlowStart
 		return R.ok("发起成功");
 	}
 
+	@Override
+	public R getModelById(Long id, int type){
+		/*EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(id);
+         List<StaffSimpleInfo> 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<StaffSimpleInfo> staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup);
-        //flowStart = flowStartService.selectFlowStartById(flowStart.getId());
-         //List<StaffEntity> 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 @@
 
 
     <select id="selectByStaffId" resultType="com.lz.modules.app.entity.DepartmentsStaffRelateEntity">
-        select * from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId}
+        select * from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId} limit 1
     </select>