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

backend/src/main/java/io/dataease/ext/HomeMapper.xml

@@ -3,15 +3,15 @@
 <mapper namespace="io.dataease.ext.HomeMapper">
 
     <select id="queryStore" resultType="io.dataease.mobile.dto.HomeItemDTO">
-       select
-            s.panel_group_id as id,
-            g.name as title,
-            s.create_time as `time`
+        select
+        s.panel_group_id as id,
+        g.name as title,
+        s.create_time as `time`
         from( SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE ( #{userId}, 'panel' ) cids ) t, panel_store s
         inner join panel_group g
-            on s.panel_group_id = g.id
+        on s.panel_group_id = g.id
         where s.user_id = #{userId}
-                and FIND_IN_SET( g.id, cids  )
+        and FIND_IN_SET( g.id, cids )
         <if test="lastTime != null">
             and #{lastTime} > s.create_time
         </if>
@@ -20,25 +20,32 @@
 
     <select id="queryShare" resultType="io.dataease.mobile.dto.HomeItemShareDTO">
         select
-            distinct(s.panel_group_id) as id,
-            g.name as title,
-            s.create_time as `time`,
-            u.nick_name,
-            u.user_id
+        distinct(s.panel_group_id) as id,
+        g.name as title,
+        s.create_time as `time`,
+        u.nick_name,
+        u.user_id
         from panel_share s
         inner join panel_group g
-            on s.panel_group_id = g.id
+        on s.panel_group_id = g.id
         left join sys_user u on u.username = IFNULL(s.granter,g.create_by)
         where
-            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 )
-            )
+        g.mobile_layout = 1 and (
+        ( s.target_id = #{userId} and s.type = 0 )
+        <if test="deptId != null">
+            or ( s.target_id = #{deptId} and s.type = 2 )
+        </if>
+
+        <if test="roleIds != null">
+            or
+            ( s.target_id in
+            <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+                #{roleId}
+            </foreach>
+            and s.type = 1 )
+        </if>
+
+        )
         <if test="lastTime != null">
             and #{lastTime} > s.create_time
         </if>
@@ -46,6 +53,4 @@
     </select>
 
 
-
-
 </mapper>

backend/src/main/java/io/dataease/mobile/service/HomeService.java

@@ -11,7 +11,9 @@ import io.dataease.mobile.dto.HomeItemDTO;
 import io.dataease.mobile.dto.HomeItemShareDTO;
 import io.dataease.ext.HomeMapper;
 import io.dataease.mobile.dto.HomeRequest;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
@@ -47,7 +49,10 @@ public class HomeService {
         List<Long> roleIds = user.getRoles().stream().map(CurrentRoleDto::getId).collect(Collectors.toList());
 
         param.put("deptId", deptId);
-        param.put("roleIds", roleIds);
+        if (CollectionUtils.isNotEmpty(roleIds)) {
+            param.put("roleIds", roleIds);
+        }
+
         if (null != request.getLastTime()) {
             param.put("lastTime", request.getLastTime());
         }

frontend/src/components/canvas/custom-component/UserView.vue

@@ -173,7 +173,7 @@
       :append-to-body="true"
       :destroy-on-close="true"
     >
-      <UserViewMobileDialog
+      <user-view-mobile-dialog
         v-if="mobileChartDetailsVisible"
         :canvas-style-data="canvasStyleData"
         :chart="showChartInfo"
@@ -211,10 +211,11 @@ import DeRichTextView from '@/components/canvas/custom-component/DeRichTextView'
 import Vue from 'vue'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
 import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
+import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog'
 
 export default {
   name: 'UserView',
-  components: { UserViewDialog, DeRichTextView, LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
+  components: { UserViewMobileDialog, UserViewDialog, DeRichTextView, LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
   props: {
     canvasId: {
       type: String,
@@ -807,7 +808,6 @@ export default {
       this.showChartInfo = this.chart
       this.showChartTableInfo = tableChart
       this.showChartInfoType = params.openType
-      this.chartDetailsVisible = true
       if (this.terminal === 'pc') {
         this.chartDetailsVisible = true
       } else {