|
@@ -148,17 +148,17 @@ public class EVisaTaskCheckController {
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
//获取每个填报表对应的wbs_tree_private的id
|
|
|
for (WbsTreeContract treeContract : node) {
|
|
|
-// WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
|
|
|
-// ids.add(wbsTreePrivate.getPKeyId());
|
|
|
- if (StringUtils.isNotBlank(treeContract.getIsTypePrivatePid()+"")){
|
|
|
- ids.add(treeContract.getIsTypePrivatePid());
|
|
|
- }
|
|
|
+ WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
|
|
|
+ ids.add(wbsTreePrivate.getPKeyId());
|
|
|
+// if (StringUtils.isNotBlank(treeContract.getIsTypePrivatePid()+"")){
|
|
|
+// ids.add(treeContract.getIsTypePrivatePid());
|
|
|
+// }
|
|
|
}
|
|
|
JSONObject object = new JSONObject();
|
|
|
object.put("privatePKeyId",ids);
|
|
|
List<JSONObject> jsonList = this.queryTableEVisaConfig(object);
|
|
|
if (jsonList == null || jsonList.size() <= 0) {
|
|
|
- return R.data(300, false, "未找到符合电签配置的相关流程,请联系服务人员处理");
|
|
|
+ return R.data(300, false, contract.getNodeName() +":未找到符合电签配置的相关流程,请联系服务人员处理");
|
|
|
}
|
|
|
|
|
|
//汇总电签配置的审批角色
|