测站点查询bug

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

@@ -188,7 +188,7 @@ public class FormulaController {
                           /*取层级*/
                           formula.setFormula("FC.tree(trees,WP["+bean.getK()+"])");
                     }else{
-                        /*直接取数*/
+                           /*直接取数*/
                           formula.setFormula("WP["+bean.getK()+"]");
                     }
                     formula.setMap(JSON.toJSONString(map));

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/FormulaClientImpl.java

@@ -1,25 +1,17 @@
 package org.springblade.manager.feign;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
-import org.springblade.manager.dto.ElementData;
-import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.Formula;
 import org.springblade.manager.formula.KeyMapper;
 import org.springblade.manager.service.IExcelTabService;
 import org.springblade.manager.service.IFormulaService;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author yangyj
@@ -41,10 +33,9 @@ public class FormulaClientImpl implements  FormulaClient{
         StringBuilder sb = new StringBuilder();
         try {
             Map<String,String> keysMap = this.excelTabService.getTablbCols(String.valueOf(pkId),null);
-            Map<String, Object> queryForMap = this.jdbcTemplate.queryForMap("SELECT   a.p_key_id as nodeId,b.id as fieldId,b.e_key as field,c.init_table_name as tableName  from m_wbs_tree_contract a LEFT JOIN m_wbs_form_element b on a.id=b.f_id left JOIN m_wbs_tree c on a.id=c.id where b.e_key='"+key+"' and b.is_deleted=0 and a.p_key_id = (" + pkId + ")");
-          if(Func.isNotEmpty(queryForMap)) {
-              KeyMapper keyMapper = BeanUtil.toBean(queryForMap, KeyMapper.class);
-              Formula formula = this.service.getById(keyMapper.getFormulaId());
+           Long id = this.jdbcTemplate.queryForObject("select d.formula_id from m_wbs_tree_contract a join m_table_info b on a.init_table_name=b.tab_en_name join m_wbs_form_element c on c.f_id=b.id join m_element_formula_mapping d on c.id=d.element_id where a.p_key_id=1613091751017316352 and c.e_key='key_17'  ORDER BY d.scope desc limit 1",Long.class);
+          if(Func.isNotEmpty(id)) {
+              Formula formula = this.service.getById(id);
               if(Func.isNotEmpty(formula)) {
                   formula.getRelyList().forEach(e -> {
                       sb.append(keysMap.get(e.split(StringPool.COLON)[1])).append(StringPool.COMMA);