|
@@ -200,11 +200,11 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
|
|
|
result = knowledgeApprovalNodeFlowerMapper.findAllNodesByCategoryId(categoryId);
|
|
|
defaultNode(result.get(0),userId);
|
|
|
result.forEach(e -> {
|
|
|
- KnowledgeAgent knowledgeAgent = hasTager(e);
|
|
|
- if (Objects.nonNull(knowledgeAgent)) {
|
|
|
- e.setApproverId(knowledgeAgent.getTagerNo());
|
|
|
- e.setApproverName(userService.queryByUsername(knowledgeAgent.getTagerNo()).getFullName());
|
|
|
- }
|
|
|
+ //KnowledgeAgent knowledgeAgent = hasTager(e);
|
|
|
+ //if (Objects.nonNull(knowledgeAgent)) {
|
|
|
+ // e.setApproverId(knowledgeAgent.getTagerNo());
|
|
|
+ // e.setApproverName(userService.queryByUsername(knowledgeAgent.getTagerNo()).getFullName());
|
|
|
+ //}
|
|
|
e.setApproverAndActualName(e.getApproverName());
|
|
|
});
|
|
|
return result;
|
|
@@ -233,11 +233,11 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
|
|
|
}
|
|
|
defaultNode(result.get(0),userId);
|
|
|
result.forEach(e -> {
|
|
|
- KnowledgeAgent knowledgeAgent = hasTager(e);
|
|
|
- if (Objects.nonNull(knowledgeAgent)) {
|
|
|
- e.setApproverId(knowledgeAgent.getTagerNo());
|
|
|
- e.setApproverName(userService.queryByUsername(knowledgeAgent.getTagerNo()).getFullName());
|
|
|
- }
|
|
|
+ //KnowledgeAgent knowledgeAgent = hasTager(e);
|
|
|
+ //if (Objects.nonNull(knowledgeAgent)) {
|
|
|
+ // e.setApproverId(knowledgeAgent.getTagerNo());
|
|
|
+ // e.setApproverName(userService.queryByUsername(knowledgeAgent.getTagerNo()).getFullName());
|
|
|
+ //}
|
|
|
e.setApproverAndActualName(e.getApproverName());
|
|
|
});
|
|
|
return result;
|
|
@@ -279,6 +279,7 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
|
|
|
}
|
|
|
//处理默认节点
|
|
|
String deptId = null;
|
|
|
+ String userNo = userService.queryLoginUsername();
|
|
|
if (StringUtils.isEmpty(userId)){
|
|
|
deptId = userService.queryLoginUserDeptId();
|
|
|
} else {
|
|
@@ -292,26 +293,40 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
|
|
|
String approverId = parentUserIdList.parallelStream().map(e -> userService.queryOsUserDto(e).getUserNo()).
|
|
|
collect(Collectors.joining(","));
|
|
|
|
|
|
- String[] split = approverId.split(",");
|
|
|
- //处理默认节点有两个领导的情况(默认节点默认在第一位)
|
|
|
- if (split.length > 1){
|
|
|
- String approverIdTager = knowledgeAgentService.hasLeaderMore(split);
|
|
|
- result.setApproverId(approverIdTager);
|
|
|
- } else {
|
|
|
- result.setApproverId(approverId);
|
|
|
+ //如果查出来的直属部门领导包含了当前登陆人,去查询该登陆人的直属上司
|
|
|
+ if (approverId.contains(userNo)) {
|
|
|
+ approverId = knowledgeApprovalNodeFlowerMapper.findParentUserId(userNo);
|
|
|
+ if (StringUtils.isEmpty(approverId)){
|
|
|
+ approverId = userNo;
|
|
|
+ }
|
|
|
}
|
|
|
+ //String[] split = approverId.split(",");
|
|
|
+ //处理默认节点有两个领导的情况(默认节点默认在第一位)
|
|
|
+ //if (split.length > 1){
|
|
|
+ // String approverIdTager = knowledgeAgentService.hasLeaderMore(split);
|
|
|
+ // result.setApproverId(approverIdTager);
|
|
|
+ //} else {
|
|
|
+ result.setApproverId(approverId);
|
|
|
+ //}
|
|
|
//审核人姓名
|
|
|
- String approverName = Arrays.asList(result.getApproverId().split(",")).parallelStream().map(e -> userService.queryUser(e).getFullName()).
|
|
|
+ String approverName = Arrays.asList(result.getApproverId().split(",")).parallelStream().map(e -> userService.queryByUsername(e).getFullName()).
|
|
|
collect(Collectors.joining(","));
|
|
|
result.setApproverName(approverName);
|
|
|
} else {
|
|
|
+ String parentUserId;
|
|
|
if (StringUtils.isEmpty(userId)){
|
|
|
- result.setApproverId(userService.queryLoginUsername());
|
|
|
- result.setApproverName(userService.queryLoginFullName());
|
|
|
+ parentUserId = knowledgeApprovalNodeFlowerMapper.findParentUserId(userService.queryLoginUsername());
|
|
|
+ if (StringUtils.isEmpty(parentUserId)){
|
|
|
+ parentUserId = userService.queryLoginUsername();
|
|
|
+ }
|
|
|
} else {
|
|
|
- result.setApproverId(userService.queryOsUserDto(userId).getUserNo());
|
|
|
- result.setApproverName(userService.queryUser(userId).getFullName());
|
|
|
+ parentUserId = knowledgeApprovalNodeFlowerMapper.findParentUserId(userService.queryOsUserDto(userId).getUserNo());
|
|
|
+ if (StringUtils.isEmpty(parentUserId)){
|
|
|
+ parentUserId = userService.queryOsUserDto(userId).getUserNo();
|
|
|
+ }
|
|
|
}
|
|
|
+ result.setApproverId(parentUserId);
|
|
|
+ result.setApproverName(userService.queryByUsername(parentUserId).getFullName());
|
|
|
}
|
|
|
result.setApproverAndActualName(result.getApproverName());
|
|
|
}
|