公式相关调整

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

@@ -22,8 +22,10 @@ import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.*;
 import org.springblade.manager.entity.ElementFormulaMapping;
 import org.springblade.manager.entity.Formula;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.service.IElementFormulaMappingService;
 import org.springblade.manager.service.IExcelTabService;
+import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.manager.service.impl.FormulaServiceImpl;
 import org.springblade.manager.wrapper.FormulaWrapper;
 import org.springframework.beans.BeanUtils;
@@ -50,6 +52,7 @@ public class FormulaController {
     private final IExcelTabService tabService;
     private final IElementFormulaMappingService elementFormulaMappingService;
     private final JdbcTemplate jdbcTemplate;
+    private final IWbsTreeService wbsTreeService;
     /**
      * 新增或修改
      */
@@ -90,13 +93,13 @@ public class FormulaController {
                          this.elementFormulaMappingService.save(efm);
                          return R.success("新增成功");
                      }else{
-                         R.fail("保存不成功，请检查nodeId字段是否为空") ;
+                       return   R.fail("保存不成功，请检查nodeId字段是否为空") ;
                      }
                  }else{
-                      R.status(this.service.save(fa));
+                     return  R.status(this.service.save(fa));
                  }
              }else{
-                 R.status(this.service.updateById(fa));
+                 return R.status(this.service.updateById(fa));
              }
          }
         return R.fail("保存不成功，请检查elementId、formula、scope字段是否为空");
@@ -126,7 +129,7 @@ public class FormulaController {
          Formula data = null;
          if(f.isGlobal()){
              if(f.getElementId()!=null) {
-                 data = this.service.getOne(Wrappers.<Formula>lambdaQuery().eq(Formula::getElementId, f.getElementId()));
+                 data = this.service.getOne(Wrappers.<Formula>lambdaQuery().eq(Formula::getElementId, f.getElementId()).eq(Formula::getScope,FormulaBean.GLOBAL));
              }
          }else if(f.isPart()){
              if(f.getElementId()!=null&&f.getNodeId()!=null) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -333,7 +333,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
              wbsFormElements.forEach(e->{
                  e.setGlobalFormula(longs.contains(e.getId())?1:0);
              });
-             List<Long> longs2= this.jdbcTemplate.queryForList("select a.id from m_wbs_form_element a INNER JOIN m_element_formula_mapping b on a.id=b.element_id where a.id in("+elementIds+")and b.node_id="+id,Long.class);
+             List<Long> longs2= this.jdbcTemplate.queryForList("select a.id from m_wbs_form_element a INNER JOIN m_element_formula_mapping b on a.id=b.element_id  where a.id in("+elementIds+")and b.node_id=(select parent_id from m_wbs_tree where id ="+id+")",Long.class);
              wbsFormElements.forEach(e->{
                  e.setIsSaveFormula(longs2.contains(e.getId())?1:0);
              });