业主合同段加载混乱

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -14,12 +14,15 @@ import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.manager.entity.ContractRelationJlyz;
 import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.manager.vo.WbsTreeContractLazyVO;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -33,6 +36,7 @@ public class WbsTreeController extends BladeController {
     @Autowired
     StringRedisTemplate redisTemplate;
     private final IUserService iUserService;
+    private final JdbcTemplate jdbcTemplate;
 
     /**
      * 客户端懒加载获取合同段树（统计颜色、填报数量）
@@ -61,7 +65,13 @@ public class WbsTreeController extends BladeController {
         List<WbsTreeContractLazyVO> vos;
         String dataInfoId = "";
         if (("1").equals(classifyType)) {
-            dataInfoId = contractId + "_" + parentId + "_" + classifyType + "_" + tableOwner;
+            String sql="Select * from m_contract_relation_jlyz where contract_id_jlyz="+contractId;
+            List<ContractRelationJlyz> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ContractRelationJlyz.class));
+            if(query!=null&&query.size()>1){
+                dataInfoId = contractIdRelation + "_" + parentId + "_" + "1" + "_" + tableOwner;
+            }else {
+                dataInfoId = contractId + "_" + parentId + "_" + classifyType + "_" + tableOwner;
+            }
         } else if (("2").equals(classifyType)) {
             dataInfoId = contractIdRelation + "_" + parentId + "_" + "1" + "_" + tableOwner;
         }