节点参数

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsParamBean.java

@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @Data
 public class WbsParamBean {
-    @ApiModelProperty(value = "名称",required =true)
+    @ApiModelProperty(value = "名称")
     private  String name;
     @ApiModelProperty(value = "流水号，修改必传")
     private  Long id;

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

@@ -73,6 +73,17 @@ public class WbsParamController {
     @ApiOperation(value = "批量保存或修改参数", notes = "批量保存或修改参数")
     public R saveOrUpdateBatch(@RequestBody List<WbsParamBean> wps) {
        if(CollectionUtil.isNotEmpty(wps)){
+           if(wps.size()==1){
+               WbsParamBean kone = wps.get(0);
+               if(kone.getType()<0){
+                   if(Func.isNotEmpty(kone.getWbsId())) {
+                       this.service.update(Wrappers.<WbsParam>update().lambda().set(WbsParam::getIsDeleted, 1).eq(WbsParam::getWbsId, kone.getWbsId()));
+                       return R.status(true);
+                   }else{
+                       return R.fail("至少保留一个模版");
+                   }
+               }
+           }
            List<Long> ids= wps.stream().map(WbsParamBean::getId).filter(Objects::nonNull).collect(Collectors.toList());
            if(CollectionUtil.isNotEmpty(ids)){
                WbsParamBean one = wps.get(0);
@@ -102,7 +113,7 @@ public class WbsParamController {
            }
            return  R.status(true);
        }
-       return R.status(false);
+       return R.fail("没有提交任何参数");
     }
 
     /**

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

@@ -255,7 +255,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             List<Object> values = slice( local,this.env.constantMap,f);
                             if(values.size()>fd.getValues().size()){
                                 /*当生成的数据超过实际容量的时候，会自动合并到第一个单元格*/
-                                fd.getValues().get(0).setValue(values.stream().map(StringUtils::handleNull).collect(Collectors.joining("、")));
+                                fd.getValues().get(0).setValue(values.stream().filter(Func::isNotEmpty).map(StringUtils::handleNull).collect(Collectors.joining("、")));
                             }else{
                                 for(int n=0;n<values.size();n++){
                                     fd.getValues().get(n).setValue(values.get(n));