|
|
@@ -47,17 +47,17 @@ public class WorkflowImplService implements WorkflowService {
|
|
|
if (workflows != null){
|
|
|
workflows.forEach(workflow -> {
|
|
|
List<FileInfo> fileInfoList;
|
|
|
- if (workflow.getStatus() == 2 && workflow.getType() == 1 || workflow.getType() == 2){
|
|
|
- fileInfoList = fileDao.queryList("and link_id = '"+workflow.getLinkId()+"'");
|
|
|
+ if ((workflow.getStatus() == 2 && workflow.getType() == 1) || workflow.getType() == 2 || workflow.getStatus() == 1){
|
|
|
+ fileInfoList = fileDao.queryList("and link_id = '"+workflow.getLinkId()+"' and (`name` is null or `name` not like '%营业执照%') ");
|
|
|
}
|
|
|
//region
|
|
|
//2023-10-11 A-jax添加推文流程数据获取逻辑
|
|
|
else if(workflow.getType() == 3){
|
|
|
- fileInfoList = articleTweetDao.queryList("and link_id = '"+workflow.getLinkId()+"'");
|
|
|
+ fileInfoList = articleTweetDao.queryList("and link_id = '"+workflow.getLinkId()+"' ");
|
|
|
}
|
|
|
//endregion
|
|
|
else {
|
|
|
- fileInfoList = fileDao.queryList("and link_id = '"+workflow.getId()+"'");
|
|
|
+ fileInfoList = fileDao.queryList("and link_id = '"+workflow.getId()+"' and (`name` is null or `name` not like '%营业执照%') ");
|
|
|
}
|
|
|
workflow.setFileInfoList(fileInfoList);
|
|
|
});
|