k94314517
2023-09-05 fa2f172812de8344fa22c4ef088ea2a67257a0d3
server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -128,11 +128,11 @@
        }
        QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
        Device queryDeviceExtDTO=new Device();
        queryDeviceExtDTO.setDeleted(Constants.ZERO);
        queryDeviceExtDTO.setCode(device.getCode());
        queryDeviceExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
        List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
        List<Device> list= deviceService.findList(queryDeviceExtDTO);
        if(list.size()>0){
            if(!Constants.equalsInteger(list.get(0).getId(),device.getId())){
                return ApiResponse.failed("设备编码,不允许添加");
@@ -166,6 +166,10 @@
        deviceService.updateById(find);
        if(StringUtils.isNotBlank(device.getUserIds())){
            deviceService.dealDeviceUserId(Constants.ONE,device.getUserIds(),device.getId(),getLoginUser());
        }else {
            UserDevice userDevice = new UserDevice();
            userDevice.setDeviceId(device.getId());
            userDeviceService.delete(userDevice);
        }
        return ApiResponse.success(null);