|
@@ -94,7 +94,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
throw new ParameterException("deviceName不能为空");
|
|
throw new ParameterException("deviceName不能为空");
|
|
}
|
|
}
|
|
ScannerEntity scanner = scannerService.findByDeviceName(loginInfo.getDeviceName());
|
|
ScannerEntity scanner = scannerService.findByDeviceName(loginInfo.getDeviceName());
|
|
- if(scanner!=null){
|
|
|
|
|
|
+ if(scanner!=null && !scanner.getDevice().equals(loginInfo.getDevice())){
|
|
throw new ParameterException("deviceName已存在");
|
|
throw new ParameterException("deviceName已存在");
|
|
}
|
|
}
|
|
SystemConfigEntity config = systemConfigService.find();
|
|
SystemConfigEntity config = systemConfigService.find();
|