Merge remote-tracking branch 'origin/master'

src/main/java/com/syc/slm/slmbi/dao/InstrumentPanelDraftMapper.java

@@ -18,4 +18,12 @@ public interface InstrumentPanelDraftMapper extends BaseMapper<InstrumentPanelDr
 
     List<InstrumentPanelDraft> selectDraftList(@Param("appId") String appId,@Param("panelIds") Set<String> panelIds, @Param("officeIds") String officeIds, @Param(
         "userId") String userId, @Param("roleId") String roleId);
+
+    /**
+     * 超级管理员查询本租户下的发布面板
+     * @param appId 相当于租户ID
+     * @param panelIds 面板Id
+     * @return 发布的仪表盘
+     */
+    List<InstrumentPanelDraft> selectDraftListByAdmin(@Param("appId") String appId,@Param("panelIds") Set<String> panelIds);
 }

src/main/java/com/syc/slm/slmbi/entity/CurrentUser.java

@@ -15,4 +15,5 @@ public class CurrentUser {
     private String platformId;
     private String name;
     private String token;
+    private Boolean isAdmin;
 }

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelDraftService.java

 package com.syc.slm.slmbi.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.entity.InstrumentPanel;
 import com.syc.slm.slmbi.entity.InstrumentPanelDraft;
 
@@ -30,6 +31,7 @@ public interface InstrumentPanelDraftService extends IService<InstrumentPanelDra
 
     /**
      * 获取仪表板信息
+     * @param currentUser
      * @param appId
      * @param panelIds
      * @param officeIds
@@ -37,7 +39,7 @@ public interface InstrumentPanelDraftService extends IService<InstrumentPanelDra
      * @param roleId
      * @return
      */
-    List<InstrumentPanelDraft> selectDraftList(String appId,Set<String> panelIds, String officeIds, String userId, String roleId);
+    List<InstrumentPanelDraft> selectDraftList(CurrentUser currentUser,String appId,Set<String> panelIds, String officeIds, String userId, String roleId);
 
     /**
      * 根据仪表板id获取 仪表板草稿

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

@@ -10,6 +10,7 @@ import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.slmbi.dao.InstrumentPanelDraftMapper;
 import com.syc.slm.slmbi.entity.BaseEntity;
+import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.entity.InstrumentPanel;
 import com.syc.slm.slmbi.entity.InstrumentPanelDraft;
 import com.syc.slm.slmbi.service.InstrumentPanelDraftService;
@@ -62,8 +63,12 @@ public class InstrumentPanelDraftServiceImpl extends ServiceImpl<InstrumentPanel
     }
 
     @Override
-    public List<InstrumentPanelDraft> selectDraftList(String appId, Set<String> panelIds, String officeIds, String userId, String roleId) {
-        return baseMapper.selectDraftList(appId, panelIds, officeIds, userId, roleId);
+    public List<InstrumentPanelDraft> selectDraftList(CurrentUser currentUser,String appId, Set<String> panelIds, String officeIds, String userId, String roleId) {
+        if (currentUser.getIsAdmin()){
+            return baseMapper.selectDraftListByAdmin(appId,panelIds);
+        }else {
+            return baseMapper.selectDraftList(appId, panelIds, officeIds, userId, roleId);
+        }
     }
 
     @Override

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

@@ -156,7 +156,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
         List<InstrumentPanelTree> trees = baseMapper.selectList(where);
         if (CollectionUtils.isNotEmpty(trees)) {
             Set<String> panelIds = trees.stream().map(BaseEntity::getId).collect(Collectors.toSet());
-            List<InstrumentPanelDraft> panels = draftService.selectDraftList(appId, panelIds, officeIds, userId, roleId);
+            List<InstrumentPanelDraft> panels = draftService.selectDraftList(user,appId, panelIds, officeIds, userId, roleId);
             if (CollectionUtils.isNotEmpty(panels)) {
                 Set<String> publishIds = panels.stream().map(InstrumentPanelDraft::getPanelId).collect(Collectors.toSet());
                 Set<String[]> finalPanelArrays = trees.stream()
@@ -209,7 +209,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
         List<InstrumentPanelTree> trees = baseMapper.selectList(where);
         if (CollectionUtils.isNotEmpty(trees)) {
             Set<String> panelIds = trees.stream().map(BaseEntity::getId).collect(Collectors.toSet());
-            List<InstrumentPanelDraft> panels = draftService.selectDraftList(appId,panelIds,officeIds,userId,roleId);
+            List<InstrumentPanelDraft> panels = draftService.selectDraftList(user,appId,panelIds,officeIds,userId,roleId);
 
 
             if(CollectionUtils.isNotEmpty(panels)) {
@@ -296,7 +296,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
         List<InstrumentPanelTree> trees = baseMapper.selectList(where);
         if (CollectionUtils.isNotEmpty(trees)) {
             Set<String> panelIds = trees.stream().map(BaseEntity::getId).collect(Collectors.toSet());
-            List<InstrumentPanelDraft> panels = draftService.selectDraftList(tree.getAppId(),
+            List<InstrumentPanelDraft> panels = draftService.selectDraftList(user,tree.getAppId(),
                                                                              panelIds,
                                                                              officeIds,
                                                                              userId,

src/main/resources/mapper/mysql/panel/InstrumentPanelDraftMapper.xml

@@ -54,4 +54,16 @@
                )
           </if>
     </select>
+
+    <select id="selectDraftListByAdmin" resultType="com.syc.slm.slmbi.entity.InstrumentPanelDraft">
+        select * from instrument_panel_draft where panel_id in
+        <if test="panelIds!=null">
+            (
+            <foreach collection="panelIds" item="id"  separator=",">
+                #{id}
+            </foreach>
+            )
+        </if>
+        and record_status=1 and app_id = #{appId}
+    </select>
 </mapper>