Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelTreeServiceImpl.java

@@ -227,6 +227,10 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                         }
                     }
                 });
+                // 如果当前没有发布的仪表盘，仪表树就需要显示了
+                if(CollectionUtils.isEmpty(finalPanelIds)){
+                    return Lists.newArrayList();
+                }
                 List<PanelTreeNodeVo> groupTreeNodeVos = groupService.selectGroupByIds(finalPanelIds,null);
                 if (CollectionUtils.isNotEmpty(groupTreeNodeVos)) {
                     lists.addAll(groupTreeNodeVos);

src/main/resources/application-test.yml

+spring:
+  datasource:
+    username: syc_test
+    password: Test123!
+    url: jdbc:mysql://${MYSQL_HOST:124.71.87.179}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+dc_client:
+  host: http://192.168.0.186:2400/dc #http://139.9.194.252:2400/dc  # http://192.168.0.3:2400/dc  # http://apidev.sycdev.com/dc
\ No newline at end of file