Browse Source

资料查询,上报权限校验

qianxb 2 years ago
parent
commit
28039bc817

+ 5 - 2
blade-service/blade-business/src/main/java/org/springblade/business/controller/EVisaTaskCheckController.java

@@ -145,8 +145,11 @@ public class EVisaTaskCheckController {
                 List<WbsTreeContract> node = wbsTreeContractClient.queryChildByParentId(contract,"", "");
                 List<Long> ids = new ArrayList<>();
                 for (WbsTreeContract treeContract : node) {
-                    WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
-                    ids.add(wbsTreePrivate.getPKeyId());
+//                    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);

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -104,7 +104,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
             return this.wbsTreeContractService.list(wrapper);
         } else {
             //.eq(WbsTreeContract::getType, "1")
-            return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, treeNode.getId()).eq(WbsTreeContract::getContractId, treeNode.getContractId()));
+            return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, treeNode.getId()).eq(WbsTreeContract::getContractId, treeNode.getContractId()).eq(WbsTreeContract::getStatus,1));
         }
     }