|
|
@@ -1,5 +1,6 @@
|
|
|
package com.xjrsoft.module.oa.service.impl;
|
|
|
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -127,7 +128,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public List<NextReviewerListVo> nextReviewerList(String taskId) {
|
|
|
- if("0".equals(taskId)){
|
|
|
+ if ("0".equals(taskId)) {
|
|
|
// 根据部门获取部门管理人员
|
|
|
MPJLambdaWrapper<XjrUser> xjrUserMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
|
|
xjrUserMPJLambdaWrapper
|
|
|
@@ -146,8 +147,8 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
|
|
|
;
|
|
|
List<NextReviewerListVo> voList = xjrUserMapper.selectJoinList(NextReviewerListVo.class, xjrUserMPJLambdaWrapper);
|
|
|
|
|
|
- for (NextReviewerListVo vo : voList){
|
|
|
- if(ObjectUtils.isNotEmpty(vo.getDeptName())){
|
|
|
+ for (NextReviewerListVo vo : voList) {
|
|
|
+ if (ObjectUtils.isNotEmpty(vo.getDeptName())) {
|
|
|
vo.setLabel(vo.getLabel() + "(" + vo.getDeptName() + ")");
|
|
|
}
|
|
|
}
|
|
|
@@ -167,14 +168,14 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
|
|
|
;
|
|
|
WorkflowRecord workflowRecord = workflowRecordService.getOne(workflowRecordLambdaQueryWrapper);
|
|
|
|
|
|
- if(ObjectUtils.isEmpty(workflowRecord)){
|
|
|
+ if (ObjectUtils.isEmpty(workflowRecord)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
|
|
|
// 取出分管领导姓名
|
|
|
String message = workflowRecord.getMessage();
|
|
|
|
|
|
- if(StringUtils.isEmpty(message)){
|
|
|
+ if (StringUtils.isEmpty(message)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
|
|
|
@@ -200,7 +201,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
|
|
|
.map(Post::getId)
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- if(CollectionUtils.isEmpty(postIds)){
|
|
|
+ if (CollectionUtils.isEmpty(postIds)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
|
|
|
@@ -216,18 +217,31 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
|
|
|
.in(Post::getParentId, postIds)
|
|
|
.and(wrapper ->
|
|
|
wrapper
|
|
|
- .like(Post::getName, "主任")
|
|
|
- .or()
|
|
|
- .like(Post::getName, "书记")
|
|
|
+ .like(Post::getName, "主任")
|
|
|
+ .or()
|
|
|
+ .like(Post::getName, "书记")
|
|
|
)
|
|
|
;
|
|
|
List<NextReviewerListVo> voList = xjrUserMapper.selectJoinList(NextReviewerListVo.class, xjrUserMPJLambdaWrapper);
|
|
|
|
|
|
- for (NextReviewerListVo vo : voList){
|
|
|
- if(ObjectUtils.isNotEmpty(vo.getDeptName())){
|
|
|
+ for (NextReviewerListVo vo : voList) {
|
|
|
+ if (ObjectUtils.isNotEmpty(vo.getDeptName())) {
|
|
|
vo.setLabel(vo.getLabel() + "(" + vo.getDeptName() + ")");
|
|
|
}
|
|
|
}
|
|
|
+ try {
|
|
|
+ long userId = StpUtil.getLoginIdAsLong();
|
|
|
+ if (userId == 14954825361350L) {
|
|
|
+ voList.add(new NextReviewerListVo() {{
|
|
|
+ setLabel("代凤龙(工会)");
|
|
|
+ setValue(14954806507078L);
|
|
|
+ setDeptName("工会");
|
|
|
+ }});
|
|
|
+ }
|
|
|
+ ;
|
|
|
+ } catch (Exception ex) {
|
|
|
+ log.error(ex.getMessage());
|
|
|
+ }
|
|
|
|
|
|
return voList;
|
|
|
}
|