修改查询仪表盘树接口

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

@@ -210,6 +210,8 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
         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);
+
+
             if(CollectionUtils.isNotEmpty(panels)) {
                 Set<String> publishIds = panels.stream().map(InstrumentPanelDraft::getPanelId).collect(Collectors.toSet());
                 Set<String[]> finalPanelArrays = trees.stream()
@@ -218,9 +220,9 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                     .collect(Collectors.toSet());
                 Set<String> finalPanelIds = Sets.newHashSet();
                 finalPanelArrays.forEach(x -> {
-                    if (x.length > 3) {
+                    if (x.length >= 3) {
                         for (int i = 0; i < x.length; i++) {
-                            if (i == 2) {
+                            if (i == 3) {
                                 break;
                             }
                             finalPanelIds.add(x[i]);

src/main/java/com/syc/slm/slmbi/vo/CustomPermissionVo.java

@@ -15,7 +15,7 @@ import lombok.Data;
 public class CustomPermissionVo {
 
     @ApiModelProperty(value = "自定义权限类型", required = true)
-    private String type;
+    private String bizType;
 
     @ApiModelProperty(value = "代表岗位、部门或个体用户id", required = true)
     private String bizId;

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

@@ -42,14 +42,16 @@
         </if>
          and access_permission='private'  and record_status=1 and IFNULL(updater,creator)=#{userId}
         union ALL
-        select * from instrument_panel_draft where panel_id in
+        select * from instrument_panel_draft  where
+             access_permission='custom'
+            and record_status=1
             <if test="panelIds!=null">
+            and
               (
-            <foreach collection="panelIds" item="id"  separator=",">
-                #{id}
+                <foreach collection="panelIds" item="id"  separator="or">
+                  (panel_id = #{id} and check_panel_permissions(#{appId},#{id},#{officeIds},#{userId},#{roleId})>0)
                 </foreach>
                )
           </if>
-         and access_permission='custom'  and record_status=1 and check_panel_permissions(#{appId},id,#{officeIds},#{userId},#{roleId})>0
     </select>
 </mapper>