合同段树缓存bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -187,30 +187,30 @@ public class WbsTreeContractController extends BladeController {
             @ApiImplicitParam(name = "parentId", value = "父节点id，为空则查询第一级节点"),
             @ApiImplicitParam(name = "contractId", value = "合同段id"),
             @ApiImplicitParam(name = "contractIdRelation", value = "合同段关联id（监理、业主合同关联施工合同id）"),
-            @ApiImplicitParam(name = "classifyType", value = "所属方，监理、总监办的资料查询使用，=1施工数据（默认），=2监理数据"),
-            @ApiImplicitParam(name = "tableOwner", value = "所属方，节点权限，区分节点的数量、颜色")
+            @ApiImplicitParam(name = "classifyType", value = "合同段区分，施工合同段=1，监理合同段=2"),
+            @ApiImplicitParam(name = "tableOwner", value = "所属方节点权限，施工=1，监理=2，区分节点的数量、颜色")
     })
     public R<List<WbsTreeContractLazyVO>> lazyQueryContractWbsTree(@RequestParam String primaryKeyId, @RequestParam String parentId, @RequestParam String contractId, @RequestParam String contractIdRelation, @RequestParam String classifyType, @RequestParam String tableOwner) {
-        List<WbsTreeContractLazyVO> vos;
-        String dataInfoId;
         if (StringUtils.isNotEmpty(primaryKeyId)) {
             parentId = primaryKeyId;
         }
-        if (("1").equals(tableOwner)) { //质检
+        List<WbsTreeContractLazyVO> vos;
+        /*String dataInfoId;
+        if (("1").equals(classifyType)) { //质检合同段
             dataInfoId = contractId + "_" + parentId + "_" + tableOwner;
-        } else { //监理
-            dataInfoId = contractIdRelation + "_" + parentId + "_" + classifyType;
+        } else { //监理合同段
+            dataInfoId = contractIdRelation + "_" + parentId + "_" + tableOwner;
         }
         Object data = redisTemplate.opsForValue().get("blade-manager::contract:wbstree:" + dataInfoId);
         if (data != null) {
             vos = JSON.parseArray(data.toString(), WbsTreeContractLazyVO.class);
-        } else {
-            vos = iWbsTreeContractService.lazyQueryContractWbsTree(parentId, contractId, contractIdRelation, tableOwner);
-            if (vos != null) {
+        } else {*/
+        vos = iWbsTreeContractService.lazyQueryContractWbsTree(parentId, contractId, contractIdRelation, tableOwner);
+            /*if (vos != null) {
                 JSONArray array = JSONArray.parseArray(JSON.toJSONString(vos));
                 redisTemplate.opsForValue().set("blade-manager::contract:wbstree:" + dataInfoId, JSON.toJSON(array).toString());
             }
-        }
+        }*/
         return R.data(vos);
     }