From 5abf7b52783d68a393c4d0f8185c1aa5c928ad7b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 23 Dec 2021 16:04:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/mapper/ext/HomeMapper.xml   | 16 +++++++++-------
 frontend/src/lang/en.js                          |  8 ++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml
index 1ddcf6d266..a40f38b15a 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml
@@ -24,13 +24,15 @@
         inner join panel_group g
             on s.panel_group_id = g.id
         where
-            ( s.target_id = #{userId} and s.type = 0 ) or
-            ( s.target_id = #{deptId} and s.type = 2 ) or
-            ( s.target_id in
-            <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
-                #{roleId}
-            </foreach>
-            and s.type = 1 )
+            g.mobile_layout = 1 and (
+                ( s.target_id = #{userId} and s.type = 0 ) or
+                ( s.target_id = #{deptId} and s.type = 2 ) or
+                ( s.target_id in
+                <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+                    #{roleId}
+                </foreach>
+                and s.type = 1 )
+            )
         order by s.create_time desc
     </select>
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index bccd6311e5..962fc39f23 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1278,8 +1278,8 @@ export default {
     link_share_desc: 'After opening the link, anyone can access the dashboard through this link.',
     share: 'Share',
     remove_share_confirm: 'Sure removel All share ?',
-    share_in: 'Share in',
-    share_out: 'Share out',
+    share_in: 'Share With Me',
+    share_out: 'I Share',
     who_share: 'Who share',
     when_share: 'When share',
     share_to: 'Share to',
@@ -1289,7 +1289,7 @@ export default {
     datalist: 'Chart List',
     group: 'Catalogue',
     panel: 'Dashboard',
-    groupAdd: 'Create Catalogue',
+    groupAdd: 'New Group',
     panelAdd: 'Create Dashboard',
     delete: 'Delete',
     move_to: 'Move',
@@ -1325,7 +1325,7 @@ export default {
     create_public_links: 'Create public links',
     to_default: 'Save To Default',
     to_default_panel: 'Save To Default Dashboard',
-    store: 'Store',
+    store: 'Favorites',
     save_to_panel: 'Save to template',
     export_to_panel: 'Export to template',
     export_to_pdf: 'Export to PDF',