修改bug

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -11,6 +11,7 @@ import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.*;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,6 +52,9 @@ public class DeviceLibraryController {
     @Autowired
     private DeviceLogService deviceLogService;
 
+    @Autowired
+    private UserUtils userUtils;
+
     @ApiOperation(value = "根据装备id查询装备详情", notes = "根据装备id查询装备详情")
     @PostMapping("/selectByIds")
     public ResponseEntity selectByIds(@RequestBody List<Integer> ids){
@@ -336,6 +340,6 @@ public class DeviceLibraryController {
     public ResponseEntity selectNewChangeDevice(@PathVariable("id") @Min(value = 1,message = "id不能小于1") int id) {
         DeviceLibrary deviceLibrary = deviceLibraryService.getOne(id);
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.getAllByTypeAndNameAndModel(deviceLibrary.getType(), deviceLibrary.getName(), deviceLibrary.getModel());
-        return ResultUtil.success(deviceLibraries.stream().filter(deviceLibrary1 -> !deviceLibrary1.getId().equals(id) && deviceLibrary1.getLifeStatus() == 2).collect(Collectors.toList()));
+        return ResultUtil.success(deviceLibraries.stream().filter(deviceLibrary1 -> !deviceLibrary1.getId().equals(id) && deviceLibrary1.getLifeStatus() == 2 && deviceLibrary1.getOwnUnit().equals(userUtils.getCurrentUserUnitName()) &&deviceLibrary1.getLocationUnit().equals(userUtils.getCurrentUserUnitName())).collect(Collectors.toList()));
     }
 }