yangyj hace 2 años
padre
commit
1f297de245

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

@@ -203,11 +203,15 @@ public class FormulaController {
             List<Object> data = CustomFunction.rangeList(info.getSize(),info.getDesign(),info.getDev(),1,scale,1);
             String[] dw = keymap.get(info.getKey()).split(StringPool.SEMICOLON);
             Map<String,Object> result = new HashMap<>();
-            for(int i=0;i<dw.length;i++){
-                if(data.size()>i){
-                    result.put(info.getKey()+"__"+dw[i],data.get(i));
-                }else{
-                    break;
+            if(dw.length==1){
+                result.put(info.getKey()+"__"+dw[0],data.stream().map(Func::toStr).collect(Collectors.joining("、")));
+            }else{
+                for(int i=0;i<dw.length;i++){
+                    if(data.size()>i){
+                        result.put(info.getKey()+"__"+dw[i],data.get(i));
+                    }else{
+                        break;
+                    }
                 }
             }
             return R.data(result);