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

提交

Browse Source
This commit is contained in:
wulin 2020-11-23 10:40:59 +08:00
parent f04c129042
commit c8cfc3f292
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -234,7 +234,7 @@ public class DingtalkBusiness {
public String sendWorkMSGWithAsyn(Long resultRecordId ,Long flowRecordId, int type) {
logger.info("开始处理数据");
//流程跳转专用
ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
if(resultRecord != null){
@ -244,27 +244,26 @@ public class DingtalkBusiness {
fromStaff.setFlowStart(flowStart);
fromStaff.setFlowRecordId(flowRecordId);
if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType());
return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType());
}else if(type == WorkMsgTypeEnum.URGING.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.URGING.getType());
return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.URGING.getType());
}else if(type == WorkMsgTypeEnum.SKIP.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.SKIP.getType());
return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.SKIP.getType());
}else if(type == WorkMsgTypeEnum.TRANSFER.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType());
return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType());
}else{
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType());
return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType());
}
}
logger.info("无记录");
return "error";
}
//流程流转发送消息
public String sendWorkMSGWithAsyn(Long resultRecordId , int type) {
logger.info("流程流转发送消息");
return sendWorkMSGWithAsyn(resultRecordId, 0L, type);
}

2
src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
View File

@ -62,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "登录已过期，请重新登录"));
httpResponse.getWriter().print(json);
return false;