diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index b14f6f35..0b932a69 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -387,9 +387,10 @@ public class ResultRecordController extends AbstractController { staffs.addAll(departManagers.getManagers()); } } - /*if(staffs.size() == 0){ - return R.error("找不到有效的评分人,设置的评分人不存在"); - }*/ + if(staffs.size() == 0){ + log.info("无法找到评分人员,开始找绩效管理人员"); + staffs = staffService.findManger(resultRecord.getId(), 4); + } for (StaffEntity staff:staffs ) { diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index 70f7b8c8..8a367679 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -98,4 +98,6 @@ public interface StaffDao extends BaseMapper { List selectNamesByIds(@Param("list") List sIds); List selectStaffsByGroupId(@Param("copyId") Long copyId); + + List findManger(@Param("recordId") Long recordId, @Param("flowProcess") int flowProcess); } diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index dad4c18f..936f6f45 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -103,5 +103,7 @@ public interface StaffService extends IService { List selectNamesByIds(List sIds); //获取绩效考核管理员 List selectStaffsByGroupId(Long copyId); + + List findManger(Long recordId, int flowProcess); } 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 d2a37b33..a15333aa 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 @@ -529,5 +529,10 @@ public class StaffServiceImpl extends ServiceImpl impleme return staffDao.selectStaffsByGroupId(copyId); } + @Override + public List findManger(Long recordId, int flowProcess){ + return staffDao.findManger(recordId, flowProcess); + } + } 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 cba4b3fd..d1420cdd 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 @@ -383,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl + +