合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!170

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3697,7 +3697,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String cut = (String) parameter.get("cut");
         String flag = String.valueOf(parameter.get("flag"));
         //查询条件
-        StringBuilder conditionSb = new StringBuilder("where 1 = 1 and osf.connect_id is not null");
+        StringBuilder conditionSb = new StringBuilder("where 1 = 1");
 
         //过滤查询条件字段类型使用
         List<Map<String, Object>> mapList = queryCondition("1", cut, null);

jero-web/src/store/modules/user.js

@@ -136,7 +136,7 @@ const user = {
           window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot'
           window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot'
           window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview'
-          window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/preview/onlinePreview'
+          window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview'
           //Vue.ls.set(USER_AUTH,authData);
           sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))
           sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData))