修改获取权限接口，添加属性

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

@@ -14,10 +14,12 @@ import com.syc.slm.slmbi.dto.CustomPermissionDTO;
 import com.syc.slm.slmbi.dto.InstrumentPanelPermissionDTO;
 import com.syc.slm.slmbi.entity.InstrumentPanel;
 import com.syc.slm.slmbi.entity.InstrumentPanelConfig;
+import com.syc.slm.slmbi.entity.InstrumentPanelGroup;
 import com.syc.slm.slmbi.entity.InstrumentPanelPermission;
 import com.syc.slm.slmbi.enums.AccessType;
 import com.syc.slm.slmbi.enums.PublishedStatus;
 import com.syc.slm.slmbi.exception.SysException;
+import com.syc.slm.slmbi.service.InstrumentPanelGroupService;
 import com.syc.slm.slmbi.service.InstrumentPanelPermissionService;
 import com.syc.slm.slmbi.service.InstrumentPanelService;
 import com.syc.slm.slmbi.service.InstrumentPanelTreeService;
@@ -53,6 +55,9 @@ public class InstrumentPanelPermissionImpl
     @Autowired
     private InstrumentPanelTreeService treeService;
 
+    @Autowired
+    private InstrumentPanelGroupService groupService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -122,6 +127,12 @@ public class InstrumentPanelPermissionImpl
         InstrumentPanel panel = panelService.getById(instrumentPanelId);
         vo.setAccessType(panel.getAccessPermission());
         vo.setDescription(panel.getDescription());
+        vo.setPanelId(panel.getId());
+        vo.setPanelName(panel.getName());
+        // 设置分组信息
+        InstrumentPanelGroup group = groupService.getById(panel.getGroupId());
+        vo.setGroupId(panel.getGroupId());
+        vo.setGroupName(group.getName());
         List<CustomPermissionVo> vos = getPublishPermissionByPanelId(instrumentPanelId, PublishedStatus.WAIT_PUBLISHED.value);
         if(CollectionUtils.isEmpty(vos)){
             vos = getPublishPermissionByPanelId(instrumentPanelId, PublishedStatus.PUBLISHED.value);

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

@@ -27,4 +27,12 @@ public class InstrumentPanelPermissionVo {
 
     @ApiModelProperty(value = "自定义权限配置，当访问类型为CUSTOM时必填")
     private List<CustomPermissionVo> customPermissions;
+
+    /**
+     * 以下字段可能不需要，只是为了更好的兼容前端
+     */
+    private String panelId;
+    private String panelName;
+    private String groupId;
+    private String groupName;
 }