|
@@ -2581,11 +2581,11 @@ private Object reviseValue(Map<String, String> p2, String key, Object value) {
|
|
|
/*重做随机值*/
|
|
|
List<RangeJson> rjs = JSON.parseArray(setting, RangeJson.class);
|
|
|
if (value != null && !value.toString().isEmpty() && Func.isNotEmpty(rjs)) {
|
|
|
-// List<RangeJson> temp = rjs.stream().filter(rj -> rj.getPkeyId().equals(pKeyId)).collect(Collectors.toList());
|
|
|
-// if (temp.isEmpty()) {
|
|
|
-// temp = rjs;
|
|
|
-// }
|
|
|
- List<RangeJson> rangeJsons = rjs.stream().filter(rj -> rj.getPkeyId().equals(pKeyId)).collect(Collectors.toList());
|
|
|
+ List<RangeJson> temp = rjs.stream().filter(rj -> rj.getPkeyId().equals(pKeyId)).collect(Collectors.toList());
|
|
|
+ if (temp.isEmpty()) {
|
|
|
+ temp = rjs;
|
|
|
+ }
|
|
|
+ List<RangeJson> rangeJsons = temp;
|
|
|
if (!rangeJsons.isEmpty()) {
|
|
|
List<String[]> la = Arrays.stream(value.toString().split("☆")).map(s -> s.split("_\\^_")).collect(Collectors.toList());
|
|
|
/*全部为一个数的时候不用修改*/
|