|
@@ -256,6 +256,11 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
// 获取公司审核人ID
|
|
|
private String getCompanyLeader(String userId, String companyId) {
|
|
|
String leaderId = "";
|
|
|
+
|
|
|
+ String user = baseMapper.selectFinalLeaders(userId, companyId);
|
|
|
+ if (userId.equals(user)) {
|
|
|
+ return userId;
|
|
|
+ }
|
|
|
//查询部门
|
|
|
List<SysDepart> departs = sysDepartService.queryUserDeparts(userId);
|
|
|
if (!departs.isEmpty()) {
|
|
@@ -351,9 +356,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
String typ = "BL,TJ,JH,SY";
|
|
|
for (ReimburseProject project : projects) {
|
|
|
if (type.equals(project.getType())) {
|
|
|
- return "16eab477cd7a43538c1049d9678753e0";
|
|
|
+ return baseMapper.selectWelfareLeader("考试福利");
|
|
|
} else if (typ.contains(project.getType())) {
|
|
|
- return "4afbd7ef38804a558aca1329d4008d37";
|
|
|
+ return baseMapper.selectWelfareLeader("其他福利");
|
|
|
}
|
|
|
}
|
|
|
return null;
|