修改bug

src/main/java/com/care/bms/controller/OrganizationController.java

@@ -52,7 +52,8 @@ public class OrganizationController {
     @ApiOperation(tags = {"机构管理","设备管理"},value = "机构下拉列表 ----四期新增")
     public Result<List<OrganizationVO>> list4Select(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
-            List<OrganizationVO> datas = this.organizationService.queryOrgsForSelect();
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<OrganizationVO> datas = this.organizationService.queryOrgsForSelect(loginUser);
             return Result.success(datas);
         }catch (Exception e) {
             log.error("机构管理: 机构下拉列表查询出现异常",e);

src/main/java/com/care/bms/service/OrganizationService.java

@@ -73,10 +73,11 @@ public class OrganizationService {
      * 查询登陆人，所能看到的 机构列表
      * @return
      */
-    public List<OrganizationVO> queryOrgsForSelect(){
+    public List<OrganizationVO> queryOrgsForSelect(UserLogindConvertVO loginUser){
         List<OrganizationVO> datas = Lists.newArrayList();
-
-        List<CareOrganization> organizations = this.careOrganizationService.list();
+        QueryWrapper<CareOrganization> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(loginUser.getOrgId() != null, CareOrganization::getId, loginUser.getOrgId());
+        List<CareOrganization> organizations = this.careOrganizationService.list(queryWrapper);
         if (CollUtil.isNotEmpty(organizations)){
             organizations.forEach(item -> {
                 OrganizationVO vo = new OrganizationVO();
@@ -88,7 +89,7 @@ public class OrganizationService {
     }
 
     /**
-     * 查询服务站列表
+     * 查询机构列表
      *
      * @return
      */

src/main/java/com/care/bms/service/StationService.java

@@ -60,7 +60,7 @@ public class StationService {
                 BeanUtils.copyProperties(item,resVO);
                 //服务设备数量
                 QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.lambda().eq(CareDevice::getOrgId,loginUser.getOrgId());
+                queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getId());
                 resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
                 resVO.setOrgName(this.careOrganizationService.getById(resVO.getOrgId()).getName());
                 list.add(resVO);