wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-06 16:07:23 +08:00
parent 3f8bc27a34
commit 069de498f7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -1137,6 +1137,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
List<FlowRecord> currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2); List<FlowRecord> currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2);
log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId()); log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId());
if(currentResultRecords !=null && currentResultRecords.size() > 0 ){ if(currentResultRecords !=null && currentResultRecords.size() > 0 ){
FlowRecord currentFlowRecord = currentResultRecords.get(0);
int flowProcess = currentFlowRecord.getFlowProcess();
if(flowProcess < 3 ){
auth.put("showResult",0);
}
if( flowProcess < 4 ){
auth.put("showScore",0);
}
FlowRecord currentResultRecord = null; FlowRecord currentResultRecord = null;
for(FlowRecord flowRecord:currentResultRecords){ for(FlowRecord flowRecord:currentResultRecords){
if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){ if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){
@ -1146,14 +1155,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} }
} }
if(currentResultRecord !=null){ if(currentResultRecord !=null){
int flowProcess = currentResultRecord.getFlowProcess();
if(flowProcess < 3 ){
auth.put("showResult",0);
}
if( flowProcess < 4 ){
auth.put("showScore",0);
}
if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){ if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){
Map<String,Object> map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class); Map<String,Object> map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class);
List<Long> roleIds = null; List<Long> roleIds = null;