二期后台 bug

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

@@ -87,7 +87,8 @@ public class SysUserController {
     @GetMapping("/getKeeperFreeDev")
     @ApiOperation(value = "获取没分配给管家的空闲设备列表 --二期新增")
     public Result<List<DeviceVO>> getKeeperFreeDev(HttpServletRequest request, @RequestHeader("token") String token){
-        List<DeviceVO> list = this.bmsSysUserService.getFreeDeviceVOList();
+        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+        List<DeviceVO> list = this.bmsSysUserService.getFreeDeviceVOList(loginUser);
         return  Result.success("查询成功！",list);
     }
 
@@ -135,7 +136,8 @@ public class SysUserController {
     @GetMapping("/getKeeperInfo/{chambId}")
     @ApiOperation(value = "管家详情  --二期新增")
     public Result<CareSysUserVO> getKeeperInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("chambId") Long chambId){
-        CareSysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId);
+        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+        CareSysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId,loginUser);
         return  Result.success("查询成功！",orderInfo);
     }
 

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

@@ -170,7 +170,7 @@ public class BmsSysUserService{
      * @param id
      * @return
      */
-    public CareSysUserVO getCareSysUserById(Long id){
+    public CareSysUserVO getCareSysUserById(Long id,UserLogindConvertVO loginUser){
         CareSysUser careSysUser = this.careSysUserService.getById(id);
         if (careSysUser!=null){
             CareSysUserVO resVO = new CareSysUserVO();
@@ -213,7 +213,7 @@ public class BmsSysUserService{
             }
 
             //空闲设备列表
-            resVO.setFreeDeviceVOList(getFreeDeviceVOList());
+            resVO.setFreeDeviceVOList(getFreeDeviceVOList(loginUser));
             return resVO;
         }
         return null;
@@ -223,9 +223,9 @@ public class BmsSysUserService{
      * 获取空闲设备列表
      * @return
      */
-    public List<DeviceVO> getFreeDeviceVOList(){
+    public List<DeviceVO> getFreeDeviceVOList(UserLogindConvertVO loginUser){
         QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().isNull(CareDevice::getChambId);
+        queryWrapper.lambda().isNull(CareDevice::getChambId).eq(CareDevice::getOrgId,loginUser.getOrgId());
         List<CareDevice> freeDeviceList = this.careDeviceService.list(queryWrapper);
         List<DeviceVO> freeDeviceVOList = new ArrayList<>();
         if(CollUtil.isNotEmpty(freeDeviceList)){