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

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--;
             }

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);
 }

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);
+	}
+
 
 }

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);
      }
 
 

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>