FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'dev_20230216'

Browse Source 
# Conflicts:
#   src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
This commit is contained in:
高嵩
2023-04-12 19:23:54 +08:00
parent 836d70043a 486572301b
commit 527032f9ec
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+5 -7
View File
@@ -3,14 +3,11 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_activiti.task.TodoTaskController;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusMes;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Reply;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl;
import com.ydw.bat.wkflow.config.ScheduledJobEsPlan;
import com.ydw.bat.wkflow.util.http.ResponseMessage;
@@ -137,10 +134,11 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
String mesg = busProcessNews.get(0).getMesg();
JSONObject jsonObject = JSON.parseObject(mesg);
JSONObject askQuestions = jsonObject.getJSONObject("askQuestions");
if(askQuestions!=null) {
String id = askQuestions.getString("id");
return id;
String id = "";
if(null != askQuestions){
id = askQuestions.getString("id");
}
return id;
}
}
return null;