更新版本

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/ExtProgramServiceImpl.java

@@ -2,14 +2,19 @@ package com.yonde.dex.basic.core.service.impl;
 
 import com.yonde.dex.basedata.data.search.SearchItem;
 import com.yonde.dex.basedata.data.search.SearchQueryCondition;
+import com.yonde.dex.basedata.entity.data.DxPageImpl;
 import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
 import com.yonde.dex.basic.core.service.ExtProgramProjectLinkService;
 import com.yonde.dex.basic.core.service.expand.ExtDxContextService;
 import com.yonde.dex.basic.core.util.SearchUtil;
 import com.yonde.dex.context.common.vo.DxContextProjectVO;
+import com.yonde.dex.context.common.vo.DxContextVO;
+import com.yonde.dex.context.core.service.shadow.DxContextProjectServiceShadow;
 import org.springframework.stereotype.Service;
 import io.swagger.annotations.ApiOperation;
+
 import java.util.List;
+
 import com.yonde.dex.basic.common.vo.ExtProgramVO;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,19 +23,21 @@ import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.basic.core.service.ExtProgramService;
 import com.yonde.dex.basic.core.repository.ExtProgramRepository;
 import com.yonde.dex.basic.entity.po.ExtProgram;
+
 import javax.annotation.Resource;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 
 /**
-* @description: ExtProgram-ServiceImpl
-* @author: dexadmin
-* @version: V
-* @date: 2024-9-20 10:26:39
-**/
+ * @description: ExtProgram-ServiceImpl
+ * @author: dexadmin
+ * @version: V
+ * @date: 2024-9-20 10:26:39
+ **/
 @Slf4j
 @Service(ExtProgramServiceImpl.BEAN_NAME)
-public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgramService<V>{
+public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgramService<V> {
 
 
     public static final String BEAN_NAME = "extProgramServiceImpl";
@@ -45,18 +52,27 @@ public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgram
     @Autowired
     ExtDxContextService extDxContextService;
 
+    @Autowired
+    DxContextProjectServiceShadow contextProjectServiceShadow;
+
     @Override
     public Page<V> searchProps(SearchQueryCondition searchQueryCondition) {
         Page<V> page = search(searchQueryCondition);
         if (page.hasContent()) {
             for (V v : page.getContent()) {
-                //设置项目子级
+                //设置项目子级  展开target的时候并没有展开，后续重新查询展开
                 SearchQueryCondition queryCondition = SearchUtil.buildQueryWithOpenAttr("sourceId", SearchItem.Operator.EQ, v.getId(), "target");
                 List<ExtProgramProjectLinkVO> content = extProgramProjectLinkService.findRecursion(queryCondition).getContent();
                 for (ExtProgramProjectLinkVO linkVO : content) {
                     Long targetId = linkVO.getTargetId();
                     List<DxContextProjectVO> children = extDxContextService.getSingleChild(targetId);
-                    linkVO.getTarget().setChildren(children);
+                    //深度查询查不出来，以下方法查询也是有问题
+//                    DxContextVO target = extDxContextService.getContextVoById(targetId);
+                    DxContextVO target = (DxContextVO) extDxContextService.search(SearchUtil.buildQuery("id", SearchItem.Operator.EQ, targetId)).getContent().get(0);
+//                    DxContextVO target = (DxContextVO) contextProjectServiceShadow.get(targetId);
+                    target.setChildren(children);
+                    linkVO.setTarget(target);
+//                    linkVO.getTarget().setChildren(children);
                 }
                 v.setExtProgramProjectLinks(content);
             }