fix：小程序设备列表数据权限

server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java

@@ -11,12 +11,15 @@ import com.makeit.dto.platform.device.PlatDeviceQueryDTO;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceEditWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceEditWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
 import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.enums.HeaderConst;
 import com.makeit.enums.HeaderConst;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.module.iot.vo.DeviceProperties;
 import com.makeit.module.iot.vo.DeviceProperties;
+import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatRoleService;
 import com.makeit.service.platform.auth.PlatRoleService;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.device.PlatDeviceService;
+import com.makeit.utils.data.validate.CollectionUtils;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.request.RequestUtil;
 import com.makeit.utils.request.RequestUtil;
 import com.makeit.vo.platform.device.PlatDeviceListVO;
 import com.makeit.vo.platform.device.PlatDeviceListVO;
@@ -31,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -48,20 +52,17 @@ public class PlatDeviceWechatController {
     @Autowired
     @Autowired
     private PlatDeviceService platDeviceService;
     private PlatDeviceService platDeviceService;
     @Autowired
     @Autowired
-    private PlatRoleService platRoleService;
+    private PlatOrgService platOrgService;
 
 
     @ApiOperation("分页列表")
     @ApiOperation("分页列表")
     @PostMapping("page")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatDeviceListVO>> page(@RequestBody PageReqDTO<PlatDeviceQueryDTO> pageReqDTO) {
     public ApiResponseEntity<PageVO<PlatDeviceListVO>> page(@RequestBody PageReqDTO<PlatDeviceQueryDTO> pageReqDTO) {
         PlatDeviceQueryDTO dto = pageReqDTO.getData();
         PlatDeviceQueryDTO dto = pageReqDTO.getData();
-        String roleId = RequestUtil.getHeader(HeaderConst.ROLE_ID);
-        if (StringUtils.isNotEmpty(roleId)) {
-            PlatRole platRole = platRoleService.getById(roleId);
-            String dataScope = platRole.getDataScope();
-            if (StringUtils.isNotEmpty(dataScope)) {
-                dto.setOrgIds(Lists.newArrayList(dataScope.split(",")));
-            }
+        List<PlatOrg> orgs = platOrgService.belongToScopeList(new PlatOrg());
+        if (CollectionUtils.isEmpty(orgs)) {
+            return ApiResponseUtils.success(new PageVO<>());
         }
         }
+        dto.setOrgIds(orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()));
         return ApiResponseUtils.success(platDeviceService.page(pageReqDTO));
         return ApiResponseUtils.success(platDeviceService.page(pageReqDTO));
     }
     }