合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613 查看合并请求 laws-foton-slrs/foton-wkflow-rest!55
This commit is contained in:
+10
@@ -99,6 +99,11 @@ public class BusProcessModelHisController {
|
|||||||
downloadNetFile(downloadUri, file);
|
downloadNetFile(downloadUri, file);
|
||||||
// 更新在线编辑当前节点编辑状态
|
// 更新在线编辑当前节点编辑状态
|
||||||
busProcessModelHisService.modelHisOneUpdStatusById(fileId);
|
busProcessModelHisService.modelHisOneUpdStatusById(fileId);
|
||||||
|
Object keyObj = jsonObj.get("key");
|
||||||
|
if(keyObj!=null){
|
||||||
|
key = keyObj.toString();
|
||||||
|
logger.info("**********key************"+key+"=======");
|
||||||
|
}
|
||||||
ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId,standName,key);
|
ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId,standName,key);
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
@@ -176,6 +181,11 @@ public class BusProcessModelHisController {
|
|||||||
objectQueryWrapper.eq("TASK_ID",taskId);
|
objectQueryWrapper.eq("TASK_ID",taskId);
|
||||||
BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper);
|
BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper);
|
||||||
if(busProcessModelHis!=null){
|
if(busProcessModelHis!=null){
|
||||||
|
Object keyObj = jsonObj.get("key");
|
||||||
|
if(keyObj!=null){
|
||||||
|
key = keyObj.toString();
|
||||||
|
logger.info("**********key************"+key+"=======");
|
||||||
|
}
|
||||||
ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName,key);
|
ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName,key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user