门店控件修复

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/FunctionApiServiceImpl.java

@@ -156,12 +156,12 @@ public class FunctionApiServiceImpl implements FunctionApiService{
         }
         //一个流只能用一次
         Stream<String> stream = Arrays.stream(functionComponent.split(","));
-        Stream<String> stream1 = Arrays.stream(functionComponent.split(","));
+        Stream<String> streamTwo = Arrays.stream(functionComponent.split(","));
         if (stream.anyMatch(e -> !FunctionEnum.isRightCode(e))) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "功能组件值非法");
         }
         StringBuilder temp = new StringBuilder("_");
-        stream1.sorted().forEach(e -> {
+        streamTwo.sorted().forEach(e -> {
             temp.append(e).append("_");
         });
         dto.setFunctionComponent(temp.toString());

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -118,13 +118,13 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
         List<TabIndexDesc> indexDescList = this.indexDescService.listAllUnRel(notInIndexDescIdList);
 
         if (StringUtils.isNotBlank(moduleIds)) {
-            List<Integer> relModuleIdList2 = Stream.of(moduleIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());
-            List<TabIndexDesc> indexDescList2 = this.indexDescService.listByIds(relModuleIdList2);
-            if (CollectionUtils.isNotEmpty(indexDescList2)) {
+            List<Integer> relModuleIdListTwo = Stream.of(moduleIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());
+            List<TabIndexDesc> indexDescListTwo = this.indexDescService.listByIds(relModuleIdListTwo);
+            if (CollectionUtils.isNotEmpty(indexDescListTwo)) {
                 if (CollectionUtils.isEmpty(indexDescList)) {
                     indexDescList = new ArrayList<>();
                 }
-                indexDescList.addAll(indexDescList2);
+                indexDescList.addAll(indexDescListTwo);
             }
         }